OSDN Git Service

Merge "Add charging metrics" into pi-dev am: cf4f650572
authorBeverly <beverlyt@google.com>
Fri, 11 May 2018 21:10:34 +0000 (14:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 21:10:34 +0000 (14:10 -0700)
commit71346e7b1959eb879e5944728d176f8078ca918b
treebfb45c9466fbd299fdccf0c4ae12129ba98b64b9
parenteb966cdc1bbc27c0b812f9da0a39f689ebbba1b7
parent976f6ade832ddbd81f4018d2fd7eedaa71a20561
Merge "Add charging metrics" into pi-dev am: cf4f650572
am: 976f6ade83

Change-Id: I31d5c785f45fe72443dcdd24c8714dd6f69ada8c
proto/src/metrics_constants.proto
services/core/java/com/android/server/BatteryService.java