OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours...
authorJeff Sharkey <jsharkey@android.com>
Fri, 20 Oct 2017 03:24:53 +0000 (03:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 03:24:53 +0000 (03:24 +0000)
commit8e9fb175b2aa1e0a2a3df7c6e46a73a17c70ffb0
tree32992d6929746ee2b1c0ed3d34fab8cc7d3372b8
parentd81a48c7844601cb2031944143d49209bcf6f7b9
parentc10c5725308bbe9e97d0fa2bb3e1a6c817385140
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
am: c10c572530  -s ours

Change-Id: I19c8ea20b8a32b4cac1a6ccf70ed56b22c7cb083