tree fcf3defd7b7f7be8b9076ef85ec87fcd330da77f
parent a97268e2b8b4b765dea2e76d5603fe3d65d76d3a
parent a8d10945a608ac6f85a6ab85b69b9a118d7853d8
author Dianne Hackborn <hackbod@google.com> 1449086757 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449086757 +0000

Merge "Fix reporting of uid state in battery stats."