OSDN Git Service

Merge "Hidden API blacklisting killswitch." am: 46656fa28e
authorMathew Inwood <mathewi@google.com>
Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)
commita8bb7189ba84a38f88182f525b3cbad9acf3f982
tree522da43949b89fd8fb0d5517b0c0d95f8abccf77
parent7b2ffeff58b6d5db83a70f43f3ef4c7b9f9b3ff5
parent84259cea5988f20fce4ece5a71f050abda1f54db
Merge "Hidden API blacklisting killswitch." am: 46656fa28e
am: 84259cea59

Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
services/core/java/com/android/server/am/ActivityManagerService.java