Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 2494361" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-04-23 00:27:18 +00:00
committed by Android (Google) Code Review

Diff Content Not Available