tree fc26565998046791763eb11524ff14f53fdeed85
parent e9aaf3c546029b69ff1ca2a5683e5afd60a29a6c
parent a54bfed476559cc7eb3ca47457bb024686b0a7ba
author Android Build Merger (Role) <android-build-merger@google.com> 1507760072 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507760072 +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" into oc-dr1-dev-plus-aosp