OSDN Git Service

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)
commit4a60106aa0486cd7bedd138af5981dd307f38792
treee19bd5687deca48bb98ab968aa64afa9aed45b47
parent2399d935bcec206e18041e00f7f0be3bc32069ce
parent254369967aa7153eff96a819126bfbc1c193ba6d
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
services/core/java/com/android/server/accounts/AccountManagerService.java