tree c8a6d687014d9bf001dd534d9251e04ff6e9f90e
parent c65dfef3f5ee07883446be0e6907f15fe457da9d
parent 245408d29018fee4b1231e52f5da1edcc3283c4a
author Adam Lesinski <adamlesinski@google.com> 1384810165 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384810165 -0800

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

* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc