tree d76d24a42425f9a7ad48b0a6dd592408883741b8
parent 74c25744ee67839a0966e41d10adb0f1d235cc49
parent 422dd005cdccf64b668026c5c6cf2e9c0af1c34e
author Jeff Sharkey <jsharkey@android.com> 1568312270 -0700
committer android-build-merger <android-build-merger@google.com> 1568312270 -0700

[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours am: 01787e9e4d -s ours am: fde3c88071
am: 422dd005cd

Change-Id: Ia9e48a0899c7dd5bad4bf5508ab7cb453ac8e201