OSDN Git Service

Merge "Track camera and flashlight usage in battery stats." into mnc-dev
authorRuben Brunk <rubenbrunk@google.com>
Tue, 2 Jun 2015 01:48:21 +0000 (01:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jun 2015 01:48:27 +0000 (01:48 +0000)
commit11df5b66ef621c4d67f5b4980e879784de43fd70
tree7051a60703edd99c8c3b67d24d0e80dc986a42c0
parent082138cd1cfbd6251c71df0cf955381e9c703652
parent6d2c363fd59af805380622ff7a3ce4c34975aab2
Merge "Track camera and flashlight usage in battery stats." into mnc-dev
core/java/android/os/BatteryStats.java
services/core/java/com/android/server/am/BatteryStatsService.java