Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp

Browse Source

am: 289b4d8c53  -s ours

Change-Id: Id4fe5d06de655a44e1b0a40aed44acc32df3b30e

...

This commit is contained in:

Jeff Sharkey

2017-10-11 22:37:44 +00:00

committed by android-build-merger

parent 6f2ab66f45 289b4d8c53

commit d8a053cda2

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