Skip to content
Commit 40a236db authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs... 

[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081 am: b0054f05
am: c97dfb57 -s ours
am skip reason: subject contains skip directive

Change-Id: I6467326680d2164bb4e2a9e54dc22cc490e2492d
parents 2ccbb357 c97dfb57
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment