tree cd81592572ae033e963e7178553b7679dcbbae12
parent fb4a74f26b6fac845e5e9174b0caf36491b87be0
parent b23e6358af0f2ca6acec58ce579ee625e06fa635
author Amith Yamasani <yamasani@google.com> 1490914253 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490914257 +0000

Merge "Bump up batterystats version to clear stale data" into oc-dev