OSDN Git Service

Merge "Add test config to net_test_osi"
authorDan Shi <dshi@google.com>
Sun, 2 Apr 2017 05:49:24 +0000 (05:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 05:49:24 +0000 (05:49 +0000)
am: 4f9e3c6376

Change-Id: Iffa7f3862d25d09735cd69bd891554efc85f5dc4


Trivial merge