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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content://... 

[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a am: 893598cd am: 7656e117  -s ours am: 58d1ac47
am: a305fbf8  -s ours

Change-Id: Iaa330703a4dd63653210f9c64898d67c78aa2760
parents 335b6c86 a305fbf8
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