Merge "Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: cad814b9bf" into nyc-mr1-dev-plus-aosp
am: df13127b4e
* commit 'df13127b4e01261b601aab4b211d97a435893d02':
Change-Id: Iec0d03efc8b9f3c2754133303ceacf2b719e1324
This commit is contained in: