tree d1ca9383e8d8e3169e4d11b90dbb6ca88b9ad7ff
parent bba6744ff4e39950f1d38dbcb09eee8b5ae2046b
parent b0054f05182bad5f004d3673d2a0dcac1fcc9bec
author Jeff Sharkey <jsharkey@google.com> 1568308455 -0700
committer android-build-merger <android-build-merger@google.com> 1568308455 -0700

Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab
am: b0054f0518

Change-Id: I491c415de567d0375296f293fcbb35ee21413ce6