Julia Reynolds d6247427ac Merge "Api updates" into oc-dev am: f84467e19f ...

am: 7ee513c27b

Change-Id: Iafbf2f2ca92b288de7bded40772cd15eca2012ee

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

..

java/com/android/server

Merge "Api updates" into oc-dev am: f84467e19f

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

jni

Pass radio HAL callbacks back to Java client.

2017-04-22 19:54:18 -07:00

Android.mk

Merge "Add implementation alternatives for OemLockManager."

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