Skip to content
Commit 3e29ba23 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add OBSERVE_ROLE_HOLDERS permission to shell." am:... 

[automerger skipped] Merge "Add OBSERVE_ROLE_HOLDERS permission to shell." am: 3d8cef1f am: 7e9b5b3c
am: 50f59c1c -s ours
am skip reason: change_id I5c979a26dae103ea1b633c2119c59363d8953aa2 with SHA1 abf0d98d is in history

Change-Id: I5be20d4dcb1d30740aa8e152e8433e7e3ee7fbbd
parents e2791fc1 50f59c1c
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