tree c9cad7ee778daeb9ff89bdb3593d497e536cbd91
parent b27a5fd45b2ae461cfa61dfff52e897d236d0d26
parent 757c6eacc8114613e2a07a5e68628bf202ce97ab
author Adam Lesinski <adamlesinski@google.com> 1461370809 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461370811 +0000

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev