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)
commitfd2e1af29a91a943e3e5cb05364a8e65d5162ddb
treea62e51968432c658128e926aea40362888205173
parent7d587036fc77cc19a3be762068f2a96d2f83ecd4
parent7a3d4d7556a961b07f9725ce8e74385b166a538b
Merge "Add test config to time-unit-tests" am: f8289b9e88 am: d48cc6e096
am: 7a3d4d7556

Change-Id: Ia6d8802579ff2f71d015a2a00dbc84d401509675