tree ba3795afa5bbce29bc13be8904fd54af6ce65ac6
parent 0b712aaf6eae21eae9f6b57366b369dd4045357b
parent 216bbc2a2e4f697d88f8fd633646e3c0433246f1
author Jeff Sharkey <jsharkey@android.com> 1568319836 -0700
committer android-build-merger <android-build-merger@google.com> 1568319836 -0700

[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am: 216bbc2a2e -s ours
am skip reason: subject contains skip directive

Change-Id: I34ab810a0ce6c747236b6e0660b0f69b8e12d4a1