| commit | 4a71a2daf6f4c34110484c0f355b4df5dd3db5f1 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:18:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:18:21 2017 +0000 |
| tree | 1a94d2393748b061aada9d5abe1fb58710874212 | |
| parent | 3f671b31940743c407871d54cd503d3f8a7edc67 [diff] | |
| parent | 7f108b81b3fd041fbba09fb313eccef4bbde980c [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6