tree 300af7e364bb12b4e4a34d9bf7356a3489a39cd0
parent 48a5dbd3cc5dd8a919983455757dc4c7b82500ab
parent 4590e52f3d0558e01322fe4dd55bb612afdfb079
author Dianne Hackborn <hackbod@google.com> 1395693750 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395693751 +0000

Merge "Battery stats: wake locks, radio active, cleanup."