tree ff951bc7b56eaa4ba3a471b3fde15f71c932de57
parent 25fcf1994c24954d34608ade2ee8fb2212e5e9d1
parent a758499ee2c981eb2000661678860da68f2f9de2
author Adam Lesinski <adamlesinski@google.com> 1437842182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437842182 +0000

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

* commit 'a758499ee2c981eb2000661678860da68f2f9de2':
  BatteryStats: Decode wakeup reasons in Java