OSDN Git Service

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

Change-Id: Icd2fab4a1170232f8b94d7ef354576b3e09f3eb1


Trivial merge