Patrick Tjin 09e0244f72 am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev ...

* commit 'b4328566fa415b69974a9721ec690a1b74880873':
  Add HSPA+ to BatteryStats

2013-11-06 10:22:32 -08:00

..

java

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

2013-11-06 10:22:32 -08:00

jni

resolved conflicts for merge of ed84dea9 to master

2013-10-29 14:58:16 -07:00

res

am 146c90ed: am 5ce5c9bc: am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev

2013-11-05 16:32:48 -08:00

tests

Merge "Get rid of coretests/android.text.HtmlTest"

2013-10-23 17:35:49 +00:00