From: Dan Shi <dshi@google.com>
Date: Fri, 31 Mar 2017 17:11:45 +0000 (+0000)
Subject: Merge "Add test config to time-unit-tests"
X-Git-Tag: android-x86-8.1-r1~40^2^2~8^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d48cc6e0964f19ba40195a1bb9feaee1318fb725;p=android-x86%2Fsystem-extras.git

Merge "Add test config to time-unit-tests"
am: f8289b9e88

Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609
---

d48cc6e0964f19ba40195a1bb9feaee1318fb725