[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content://... (1bbcd27a) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 1bbcd27a authored Oct 11, 2018 by Jeff Sharkey Committed by android-build-merger Oct 11, 2018

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

[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4 am: 010585fe am: 6ef77aed am: ae307656 skipped: 50e06f25 am: af72f01d am: 80c65f6c am: cef9bae6  -s ours am: f85bd2b2
am: 607cdde9  -s ours

Change-Id: I6f6d542bc7bf00e851583494283eb5ea8a71c02a

parents 5aaa0742 607cdde9

Hide whitespace changes

Inline Side-by-side

Please register or to comment