| commit | e3e396ac410348c7aa6e5e8bf4c38b64c0c5fc9c | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 22:02:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 22:02:35 2017 +0000 |
| tree | c901d5ac3407bcc98b36b3e9a26e9eb531cd0150 | |
| parent | fd77afd548753d8f9e1546ae30788fc86529cdbd [diff] | |
| parent | 383ab095f5793a7ed9c3151ecbaddeb869e8abc2 [diff] |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5 Change-Id: Ic1d6542b99aa8e559c17826a32ed128610c964b0