Andrew Sapperstein 31c0be94ef Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev ...

am: 972446cf03

Change-Id: I74706c0f8f2369ff06dc6d9d1d588845edd467b4

2017-10-07 00:37:06 +00:00

..

java

Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev

2017-10-07 00:37:06 +00:00

jni

Merge "NativeActivity: Improve error message reporting" am: de3150db1e am: 7de4dd6e07

2017-10-05 10:21:59 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Display "No service" on status bar when SIM unready

2017-10-06 16:42:57 -07:00

tests

Merge "Add AOD metrics in batterystats" into oc-mr1-dev

2017-10-06 07:17:25 +00:00