tree 51f9bc24e1ed59764d67f427421ab0352576ede0
parent 57171905216515a187ecb9931d402c3b09ab4b50
parent 5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5
author Patrick Tjin <pattjin@google.com> 1383762000 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383762000 -0800

am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev

* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats