OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)
commit3f671b31940743c407871d54cd503d3f8a7edc67
tree1a94d2393748b061aada9d5abe1fb58710874212
parent98371ee7c9b5175cad2e0b7060cc5983bcb828d7
parent31c5adc27979605740bd4563f5008f340570feab
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am: 31c5adc279

Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
services/core/java/com/android/server/accounts/AccountManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java