tree 7cd1776784aadce3ae98271850b990b9a2d6a5c8
parent 9f99332299d0c54832b57ccac3d6250c8a670fe5
parent bac61807d3bcfff957b358cb9ad77850bd373689
author Adam Lesinski <adamlesinski@google.com> 1384810566 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384810566 -0800

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

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