tree ad5669de5bb10cc65dc4de247bab74ded0464dc0
parent c6c91537195daef441008fe4129b7c71f7b8d687
parent e9d55d145e6ffe32933c4aad49b84be023afde20
author Jordan Liu <jminjie@google.com> 1575534257 -0800
committer android-build-merger <android-build-merger@google.com> 1575534257 -0800

[automerger skipped] Redefine query columns in provider am: d3eeb40f05 am: fe5bc3a445
am: e9d55d145e -s ours
am skip reason: change_id I5d3d99d4c85086c246490abc00a82d267a43cf1e with SHA1 b51f693e7b is in history

Change-Id: I587c7150d388db0e5e90e922f3fae48ce9edd6d7