tree 4aaf2b5ea730fbff3b70f1facec002040151c880
parent e988c3ee6a6226ab256b8d818f7e9c052cff66c7
parent f8289b9e88cce172697e3baa2da9194f84772e04
author Dan Shi <dshi@google.com> 1490980305 +0000
committer android-build-merger <android-build-merger@google.com> 1490980305 +0000

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

Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609