Rubin Xu 9b6f4057fc Merge "Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev am: c26a909f63" into pi-dev-plus-aosp ...

am: 108783f584

Change-Id: Ie8d13ff71a269930c32d7ef203f50d52109a8ad3

2018-03-07 02:30:51 +00:00

..

java

Merge "Remove toString() for CarrierIdentifier." am: e33b9f6234 am: a77bf7c48b

2018-03-07 02:11:14 +00:00

jni

Merge "AID: Change loop to repeat and set from xml"

2018-03-05 01:23:19 +00:00

proto/android

Merge "Add APP_AUTO_RESTRICTION_ENABLED"

2018-03-06 20:48:28 +00:00

res

Merge "Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev am: c26a909f63" into pi-dev-plus-aosp

2018-03-07 02:30:51 +00:00

tests

Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev am: 16268a69d6

2018-03-07 01:36:41 +00:00