Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp

Browse Source

am: a04a837f95  -s ours

Change-Id: I6ea442a00fe0ca7a6af767ae427a0d2b8256b42c

...

This commit is contained in:

Jeff Sharkey

2017-10-11 22:33:05 +00:00

committed by android-build-merger

parent 900699c173 a04a837f95

commit 6f2ab66f45

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