Skip to content
Commit eb3b16c3 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d am:... 

Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d am: 4d1b6559 am: 120891e6 am: 1cebd1fc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781187

Change-Id: I9f7bad4c1675a53b8453e38fd935dcb5cf7b4085
parents f6430ab8 1cebd1fc
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