commit | da968fb57fa7e387e47139d8b979d630e51777c2 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 22:28:09 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 22:28:09 2017 +0000 |
tree | 4dd87d885012a384d50c5da939167ebb994e1c40 | |
parent | caebafaf94b887c98e75c8bb2fdc5cd5a1c2abcf [diff] | |
parent | 6694c5c6f0404c1ea64c0d6fadc2c746ef2bd678 [diff] |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 am: 5712d1fb47" into oc-mr1-dev-plus-aosp