| commit | b969ac5fd0173446f05dc3e930de61321fcab80e | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 22:13:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 22:13:37 2017 +0000 |
| tree | c901d5ac3407bcc98b36b3e9a26e9eb531cd0150 | |
| parent | e3e396ac410348c7aa6e5e8bf4c38b64c0c5fc9c [diff] | |
| parent | e2a1e9f7d80bf2b6fd7f6583cf9e99cd96e91e7a [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 am: 4a71a2daf6 am: e2a1e9f7d8 Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9