Tim Murray 38326bd809 Merge "zygote: initialize ashmem early" ...

am: 6c155a2cf7

Change-Id: Iec7af7e1637c6b16140c20da56581609c26e2550

2019-04-05 02:48:11 -07:00

..

java

Merge "Remove SocketUtils#setSocketTimeValueOption"

2019-04-05 00:30:28 -07:00

jni

Merge "zygote: initialize ashmem early"

2019-04-05 09:35:11 +00:00

proto

Add network stack proto

2019-03-21 20:46:02 +08:00

res

Merge "Export framework-res raw resources to robolectric"

2019-04-03 21:20:21 -07:00

tests

Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"

2019-04-05 04:59:14 +00:00

xsd

Merge "Add Vts test for xsd_config"

2019-04-05 06:50:43 +00:00