Christopher Tate 6e2c3a2b36 Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev am: 39a7fe7939 ...

am: 8a04ed4c46

Change-Id: Ic267302dad04c428557168552d9b0299a9186cfa

2017-08-19 00:25:03 +00:00

..

java/com/android/server

Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev am: 39a7fe7939

2017-08-19 00:25:03 +00:00

jni

Merge "Implement region guessing." into oc-mr1-dev

2017-08-12 00:34:41 +00:00

Android.mk

services.core: remove use of -static hidl java

2017-08-03 15:19:03 -07:00