tree ac392cea4eee141e5be78ad9664c9efa05868773
parent fb05e52a9d0911f844e2183868ec1ab4840fab5e
parent 844fa00afbcf1761bdbfd5543f2328334622f7a5
author Jeff Sharkey <jsharkey@android.com> 1568321300 -0700
committer android-build-merger <android-build-merger@google.com> 1568321300 -0700

[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours am: 06cf16b862
am: 844fa00afb

Change-Id: I8a03a1670ee8aceaa50b123f9b1201e9c4957fd7