tree b94a9c2a334963859d9520e06cdbe9fc81dceb93
parent 8837aff18b1972cdbd7778e4916b6f377eecb432
parent 14ae39acbc1387a46946de88e068e10baa76f831
author Adam Lesinski <adamlesinski@google.com> 1496270215 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496270229 +0000

Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev