tree ba3795afa5bbce29bc13be8904fd54af6ce65ac6
parent aaaee164de662beb48e2d151b66f534d91edf46f
parent 2ccbb35723e911776cf4d701e1e3deabd6d84f3b
author Jeff Sharkey <jsharkey@android.com> 1568310084 -0700
committer android-build-merger <android-build-merger@google.com> 1568310084 -0700

[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours
am: 2ccbb35723 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib655f9d604bfecbd6be64b1e4cfe9996a58fcbaa