tree 4d0209c08e77be6836532f061b4d6e359bc374dc
parent 9f76abc8ab9db3306c8061e9719dbe2a998031f3
parent 1476d32b87d85885838fb066bcca48f1df9750b6
author Joe Onorato <joeo@google.com> 1462486315 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462486317 +0000

Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev