OSDN Git Service

Merge changes from topic 'hackbod_completion'
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 6 Jul 2017 02:02:21 +0000 (02:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 02:02:21 +0000 (02:02 +0000)
commit969d492531b5f902613f5e2762b84afc30d85e9a
tree5500ddd19e2356fff7d6e6490ad812fd9cd8b20e
parent3becb1f9cb8d2665d3f37a65ce44c765cda883b7
parenteb90fa9bde4e2b339e42a8dbc00f4ac3336becf9
Merge changes from topic 'hackbod_completion'

* changes:
  Fix issue #63095854: adb shell cmd jobscheduler timeout reports...
  Add reporting of how jobs complete.
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/am/BatteryStatsService.java