Jerry Zhang 86d692cb45 Merge "Update USB charging strings" into pi-dev am: f836c8940a ...

am: ceb386a8b3

Change-Id: Ice7b8ecbc0d8ae8deaefd293877270aacb720465

2018-03-16 04:32:49 +00:00

..

java

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

2018-03-16 02:58:42 +00:00

jni

Merge "Update JNI to call captureChildLayers" into pi-dev am: ed875ea132

2018-03-16 04:25:45 +00:00

proto

Merge "Adding size suffix to diskstats fields." into pi-dev am: 25300a1ff2

2018-03-16 01:13:21 +00:00

res

Merge "Update USB charging strings" into pi-dev am: f836c8940a

2018-03-16 04:32:49 +00:00

tests

Merge "Create a setting for backup/restore agent timeouts"

2018-03-15 16:56:08 +00:00