Pavel Maltsev 3379a3eff9 Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901 ...

am: ac908d6728

Change-Id: I95a4e5d519857950297f5948525990c4808cd5fd

2018-02-03 01:25:34 +00:00

..

java

Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901

2018-02-03 01:25:34 +00:00

jni

Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34

2018-02-01 03:35:32 +00:00

proto/android

Add the defaultNetwork element to the netstats.proto.

2018-01-23 18:38:48 +09:00

res

Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901

2018-02-03 01:25:34 +00:00

tests

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80 am: cf31e066a9

2018-02-02 07:05:29 +00:00