tree 83f3bc2966ccd01721fbe81b4c316b136961b4b6
parent 5c3f7236e6f5c6eeb3d3a7da4ba5ff5a7cb08651
parent 40c8725804f46c9d53f2815e0ee69e6cfb0152cc
author Dianne Hackborn <hackbod@google.com> 1395276217 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395276217 +0000

Merge "batstats: fix wake lock tracking, service bug"