commit f315961aee525d9969d01bff5ea200dce34a4628
author The Android Automerger <android-build@google.com> Wed Aug 12 01:01:04 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 12 01:01:04 2015 -0700
tree cf655ed53f335273d71e84535a3e3f1a8812ff3e
parent 0660be899f2d907dedbcb643315b73e652ec9510
parent c01f421b18b1e63fb8a6cb7b76460a5f28dadffa

merge in mnc-release history after reset to mnc-dev

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 90de8d8..0ea90a8 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -296,8 +296,8 @@
   Counter counter(Counter::CountAndDisarmNotifyFunction);
   ASSERT_EQ(0, counter.Value());
 
-  counter.SetTime(0, 1, 1, 0);
-  usleep(500000);
+  counter.SetTime(0, 500000000, 1, 0);
+  sleep(1);
 
   // The count should just be 1 because we disarmed the timer the first time it fired.
   ASSERT_EQ(1, counter.Value());