tree 4dd87d885012a384d50c5da939167ebb994e1c40
parent caebafaf94b887c98e75c8bb2fdc5cd5a1c2abcf
parent 6694c5c6f0404c1ea64c0d6fadc2c746ef2bd678
author Android Build Merger (Role) <android-build-merger@google.com> 1507760889 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507760889 +0000

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