OSDN Git Service

Merge "Add test config to net_test_device" am: 84054a8942 am: 305cd4c7bd
authorDan Shi <dshi@google.com>
Wed, 5 Apr 2017 16:39:08 +0000 (16:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 16:39:08 +0000 (16:39 +0000)
commit682b0062aa87d2e7846f294ad21cd26bfb4f8b5a
tree60321a1d91aa1387e013176d026a04a0cb8c5dfc
parent280ba214901b8fa916f78de5c132c2ac8f344472
parentc12719b657ec3d9dc9e0632bc3f6f651b587288e
Merge "Add test config to net_test_device" am: 84054a8942 am: 305cd4c7bd
am: c12719b657

Change-Id: Ifd804e322f5eebc00bd95b57a6e1d840fff64b4d