tree 58f904cda4d61b8ac4575d84f36f2ff42f64d043
parent a9f6384b6af99830fc02bcd20d593c8a543545a0
parent 79d4ef6caafdb76cfa68144ddf8002a290f8b1a2
author Nicolas Geoffray <ngeoffray@google.com> 1505822618 +0000
committer android-build-merger <android-build-merger@google.com> 1505822618 +0000

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

Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25