Ryo Hashimoto 4c8e177dab Merge "Fix buffer size check in replyRead" into pi-dev am: cf7b8a1406 ...

am: 6fde033eae

Change-Id: Ic49deb1544e34fd4692faa8d6f29d3b3bd8a85f0

2018-03-16 06:03:21 +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 "Fix buffer size check in replyRead" into pi-dev am: cf7b8a1406

2018-03-16 06:03:21 +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