OSDN Git Service

Merge "Configurable hidden API exemptions." am: 4b8285b907
authorMathew Inwood <mathewi@google.com>
Tue, 27 Mar 2018 22:19:51 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 22:19:51 +0000 (22:19 +0000)
commitc6224bfabba2c314cea9c8bfa28e13a9512c46f2
tree00cd7e1d0fa13d5d4561449b4f6df12cc3387f78
parent0d685793e72122956a97b9165829fddeaa13f526
parent625aa8d33afe2e4790e88028cbe7e30c377c678d
Merge "Configurable hidden API exemptions." am: 4b8285b907
am: 625aa8d33a

Change-Id: I3ead821be36e65c5d6abf7b40ecb3171949656f9
core/java/android/os/ZygoteProcess.java
core/java/com/android/internal/os/ZygoteConnection.java
core/java/com/android/internal/os/ZygoteInit.java
services/core/java/com/android/server/am/ActivityManagerService.java