OSDN Git Service

am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
authorYabin Cui <yabinc@google.com>
Tue, 11 Aug 2015 18:56:43 +0000 (18:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Aug 2015 18:56:43 +0000 (18:56 +0000)
commita6a12a7804402273e193074a58162cc0b3890812
tree0c9203a5a50a8ffcde795c98cf00a8fc2fbfceb1
parent8beb0c34da46a5146a2de8256db8bb42febb283c
parent0fdcdd0067af88e7deef73070d0861ceb9f53c37
am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev

* commit '0fdcdd0067af88e7deef73070d0861ceb9f53c37':
  Fix flaky test time.timer_settime_0.
tests/time_test.cpp