Sudheer Shanka d0b09dc73d Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."

2017-08-03 05:53:03 +00:00

..

java

Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."

2017-08-03 05:53:03 +00:00

jni

Merge "Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e am: 1535b8ca3b" into oc-mr1-dev-plus-aosp

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

proto/android

Merge "Settings: Remove SamplingProfiler vestiges"

2017-07-25 22:43:18 +00:00

res

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8 am: 2ac51662c2" into oc-mr1-dev-plus-aosp

2017-08-03 00:57:08 +00:00

tests

Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."

2017-08-03 05:53:03 +00:00