Amith Yamasani 26f8f5c868 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev ...

am: 5a800cf069

Change-Id: I4b2e2dc81baea8078b0bca1db357e234bda27bf7

2017-08-03 23:18:32 +00:00

..

java

Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev

2017-08-03 23:18:32 +00:00

jni

Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3

2017-08-02 22:22:38 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Update toast UI" into oc-dr1-dev

2017-08-03 18:24:51 +00:00

tests

Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev

2017-07-25 02:19:18 +00:00