Merge "Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc am: d499d79b07" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
26f4966b19