Skip to content
Commit a76d1a1b authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move Settings privapp-permissions to /product" am:... 

[automerger skipped] Merge "Move Settings privapp-permissions to /product" am: 77cf0755 am: 1b8c6b40
am: 88235ba3 -s ours
am skip reason: change_id I34fcab908db5b7a96a50b45bb45941282b05a82d with SHA1 948abe76 is in history

Change-Id: I23317dc044b1bd431c49e500ab1b6799ec6fcf83
parents 71baf16b 88235ba3
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