OSDN Git Service

Merge "Hidden API blacklisting killswitch."
authorMathew Inwood <mathewi@google.com>
Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)
commit84259cea5988f20fce4ece5a71f050abda1f54db
tree12e9829bbe2d76b420d8d1c27f5f52b42f3f6de5
parent054bed5968ea2053d9a16dd7850fdc0d4ccdf04f
parent46656fa28ec257c8ffcfe4964da3d8047cff49d4
Merge "Hidden API blacklisting killswitch."
am: 46656fa28e

Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
services/core/java/com/android/server/am/ActivityManagerService.java