tree b35e8ee0584685e05c2236ff7756c115618ee61d
parent bfd2ad60f71ac26b705c4424d30b0ecec4160df3
parent 703392e548fd837278eac09399e45977d19a1149
author Jeff Sharkey <jsharkey@android.com> 1568320352 -0700
committer android-build-merger <android-build-merger@google.com> 1568320352 -0700

[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: d3e5c766a1 -s ours
am: 703392e548

Change-Id: I3ee1977f9a1a0276dbe1e4490ba9c0c2c06cac1f