OSDN Git Service

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

Change-Id: I1318a1ea96f5652309dd481ea8b59ce54c95668d


Trivial merge