tree b35e8ee0584685e05c2236ff7756c115618ee61d
parent 958655109587da5bd102c1a128942fd8abad19be
parent 74e800be1a1ac3ee854ee9b894cae8c45d3a5421
author Jeff Sharkey <jsharkey@google.com> 1568321129 -0700
committer android-build-merger <android-build-merger@google.com> 1568321129 -0700

[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into pi-dev am: abb84003e8 -s ours
am: 74e800be1a

Change-Id: I3cddb4a5ea4af86ce8d61fb283f9ac9c0e3eb62e