Tony Mak 6fbfc05965 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev ...

am: f4362fda59

Change-Id: I130dc84ecfb47263679f6645a0b243f047c04e33

2017-04-27 09:48:13 +00:00

..

java

Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev

2017-04-27 09:48:13 +00:00

jni

Merge "Return correct value at initDataInjection and avoid crash" into oc-dev

2017-04-25 23:18:24 +00:00

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

Merge "Autofill binding permission fixes." into oc-dev

2017-04-27 05:11:38 +00:00

tests

Merge "Avoid ClassCastException in ArrayMap." into oc-dev

2017-04-27 01:31:40 +00:00