Skip to content
Commit d8f7098a 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
am: e601fa89

Change-Id: I6505d0ef0777db0afc4523e3ef2dcb5936de98d3
parents 7b18a9a6 e601fa89
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