tree a9865147c5122ff99ac6e37f3de4d7b0550c1833
parent 1decad5e8c1935157e2de74d1175a4d6876723f1
parent 45489787d7f84a5530c1e88bebc1eb6aa614bd74
author Justin Klaassen <justinklaassen@google.com> 1481940021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481940026 +0000

Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev