Skip to content
Commit 4181f7da 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: 40a236db -s ours am: b3c4ddb6
am: 29d4d347

Change-Id: Ic9312ce773a89c64e28655ed8de9fba3abe318e1
parents 0481a649 29d4d347
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