tree eb46493a44c43af830d5842eb1a2fd32279bd33b
parent 32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485
parent 1abead425c0e862e316e17521833a33d22e7a850
author Adam Lesinski <adamlesinski@google.com> 1384810362 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384810362 -0800

am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit '1abead425c0e862e316e17521833a33d22e7a850':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc