Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: f718585bf4" into oc-mr1-dev-plus-aosp

Browse Source

am: 609a6cf129  -s ours

Change-Id: I0d1ee4c0cb2c10b68eaf9587bc02c89a915fa8a4

...

This commit is contained in:

Jeff Sharkey

2017-10-12 01:41:08 +00:00

committed by android-build-merger

parent a0badaf361 609a6cf129

commit 4ff7290d78

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available