tree 7ae69cfca07dfdacc03dd502f0b451a2b8c4b6f8
parent d475549f4079c2bd08e98266a10290f2d277718f
parent 2a493532e6ce44fd6dec07a22c3a016de80ccc46
author Adam Lesinski <adamlesinski@google.com> 1437787766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437787766 +0000

am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

* commit '2a493532e6ce44fd6dec07a22c3a016de80ccc46':
  BatteryStats: Decode wakeup reasons in Java