tree dc751cfb806f13ae25549bbe85c2f095289193cb
parent 9d395bb3e2bda2188db25645c75c5ca74ad40c79
parent 0bd07225e7f1e4b501d106549f58de397a3a2e1b
author Nicolas Geoffray <ngeoffray@google.com> 1505823566 +0000
committer android-build-merger <android-build-merger@google.com> 1505823566 +0000

Merge "Special handling of priv-apps in Zygote." am: 46af70cad9 am: 79d4ef6caa am: 836f2fe701
am: 0bd07225e7

Change-Id: I21e4726a7e76a4d595cd819d64b2fcc1aa2dfd6d