Chad Brubaker a59e95a047 Merge "Address API review comments for registerReceiver" into oc-dev am: 1f4e053aef ...

am: 46f7f1c245

Change-Id: If4167d8458b144a73deeaceeaa51b1f8d482d6d7

2017-04-20 20:13:48 +00:00

..

java/com/android/server

Merge "Address API review comments for registerReceiver" into oc-dev am: 1f4e053aef

2017-04-20 20:13:48 +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