Nicolas Geoffray 836f2fe701 Merge "Special handling of priv-apps in Zygote." am: 46af70cad9 ...

am: 79d4ef6caa

Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25

2017-09-19 12:03:38 +00:00

..

java

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

2017-09-19 12:03:38 +00:00

jni

resolve merge conflicts of e017dae587 to stage-aosp-master

2017-09-13 11:08:36 +01:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge changes from topic "vpn-dialog" am: 19bb1a0b99

2017-09-19 08:17:05 +00:00

tests

Merge "Fix LinkPropertiesTest.testCompareResult"

2017-09-19 06:37:40 +00:00