tree 1ca70d7b65bfc8ecba6b07b3ae5da34a4220ad9b
parent 40a236db415e0664ff91ddcfede3985761a7df45
parent e89348b54b68e7ea2cbcc03789c40eca0ee8c6fa
author Jeff Sharkey <jsharkey@android.com> 1568309509 -0700
committer android-build-merger <android-build-merger@google.com> 1568309509 -0700

[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0
am: e89348b54b -s ours
am skip reason: subject contains skip directive

Change-Id: I80528a71e90049489b85b5c95baf93cbd3a17808