| commit | 7f108b81b3fd041fbba09fb313eccef4bbde980c | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:00:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:00:20 2017 +0000 |
| tree | 9519e8bb3ef2f992db905fcc6b303c5038b49f9d | |
| parent | 31c5adc27979605740bd4563f5008f340570feab [diff] | |
| parent | e1ae8489705297ed52f48e7c87f0c8cfcc73f2cf [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be