Amith Yamasani 7d00772ceb Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 ...

am: 26f8f5c868

Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58

2017-08-03 23:29:23 +00:00

..

java

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

2017-08-03 23:29:23 +00:00

jni

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

2017-08-02 23:41:39 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev

2017-08-03 20:46:38 +00:00

tests

Merge "Remove LangId related code." into oc-mr1-dev

2017-08-03 17:54:29 +00:00