tree a679a23ee7ab71d8e14aac8edcc99cb08defc408
parent afc76f28b93f931069bb58c4f9b524d5a99b1604
parent 2cd3fb5aa71cd32cd67ddfaafaca8f85a7ac13c6
author Adam Lesinski <adamlesinski@google.com> 1384809992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384809992 +0000

Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev