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: 0195194d85
* commit '0195194d85abbb4ce1365e1c26829608aa861796':
Change-Id: I01cf1735da3724df5901e55292a10d267093c738
This commit is contained in: