OSDN Git Service

Merge "Special handling of priv-apps in Zygote." am: 46af70cad9 am: 79d4ef6caa am...
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 19 Sep 2017 12:19:26 +0000 (12:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Sep 2017 12:19:26 +0000 (12:19 +0000)
commit46a0cf5a2b4b53c88fb6d49a7a7d07a94df60486
treedc751cfb806f13ae25549bbe85c2f095289193cb
parent9d395bb3e2bda2188db25645c75c5ca74ad40c79
parent0bd07225e7f1e4b501d106549f58de397a3a2e1b
Merge "Special handling of priv-apps in Zygote." am: 46af70cad9 am: 79d4ef6caa am: 836f2fe701
am: 0bd07225e7

Change-Id: I21e4726a7e76a4d595cd819d64b2fcc1aa2dfd6d
core/java/com/android/internal/os/Zygote.java
services/core/java/com/android/server/am/ActivityManagerService.java