Jerry Zhang ceb386a8b3 Merge "Update USB charging strings" into pi-dev ...

am: f836c8940a

Change-Id: I47ec3758b8246f3c4471a1eedc37d0a186c3ac01

2018-03-16 03:15:07 +00:00

..

java

Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev

2018-03-16 02:07:06 +00:00

jni

Merge "Update JNI to call captureChildLayers" into pi-dev

2018-03-16 01:08:06 +00:00

proto

Merge "Adding size suffix to diskstats fields." into pi-dev

2018-03-15 22:52:39 +00:00

res

Merge "Update USB charging strings" into pi-dev

2018-03-16 03:15:07 +00:00

tests

Merge "Update a bunch of AndroidTest for apct suite" into pi-dev

2018-03-15 14:29:11 +00:00