OSDN Git Service

Merge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
authorDan Shi <dshi@google.com>
Fri, 31 Mar 2017 17:16:15 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 17:16:15 +0000 (17:16 +0000)
am: 7a3d4d7556

Change-Id: Ia6d8802579ff2f71d015a2a00dbc84d401509675


Trivial merge