Gustav Sennton a1213f0b4a Merge "Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev am: 61f57e7435" into oc-dev-plus-aosp ...

am: 7195aaa360

Change-Id: I3916547e036f22a0448d096f87c9cf05379a547b

2017-04-20 16:46:53 +00:00

..

java/com/android/server

Merge "Merge "Listen to USER_STARTED instead of USER_ADDED from WebViewUpdateService." into oc-dev am: 61f57e7435" into oc-dev-plus-aosp

2017-04-20 16:46:53 +00:00

jni

Merge "Make RadioService actually talking to the HAL."

2017-04-19 20:51:36 +00:00

Android.mk

Merge "Add implementation alternatives for OemLockManager."

2017-04-19 22:53:17 +00:00