| commit | 54bfe3acddef1c15ed662afa90c2d0791a122d23 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 22:16:07 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 22:16:07 2017 +0000 |
| tree | c901d5ac3407bcc98b36b3e9a26e9eb531cd0150 | |
| parent | 289b4d8c5399c0db2dda1fbde5c95db7e1e9bffd [diff] | |
| parent | b969ac5fd0173446f05dc3e930de61321fcab80e [diff] |
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: e2a1e9f7d8" into oc-mr1-dev-plus-aosp