Skip to content
Commit 1cebd1fc 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

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

Change-Id: I207db80e60ef7e41b3245baafa38638fc573fd3e
parents f2436dd4 120891e6
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