OSDN Git Service

Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 31 May 2017 22:36:55 +0000 (22:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 May 2017 22:37:09 +0000 (22:37 +0000)
commitceb24e88cbb56aa63c990693a2d6ea35dce029f5
treeb94a9c2a334963859d9520e06cdbe9fc81dceb93
parent8837aff18b1972cdbd7778e4916b6f377eecb432
parent14ae39acbc1387a46946de88e068e10baa76f831
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/am/BatteryStatsService.java