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

[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter... 

[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069 am: f6aa7b8d am: 8acb4569 -s ours am: fd58ea60 -s ours
am: 0b712aaf

Change-Id: I6456bb9766d9c14fcd5beb3c69b24ced02605ed8
parents 422dd005 0b712aaf
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