Skip to content
Commit 97a4be88 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: If4209781fdbac2dcc28cc36d2064b74e59ac7fe6
parents 2c00ea16 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