Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9 -s ours am: 61d6dd8185 am: 438ed4369d am: d59cb81ea9" into oc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-10-20 02:21:16 +00:00
committed by Android (Google) Code Review

Diff Content Not Available