commit bf8809782ea6f13ae0c14750d53d5077e51c0205
author Christopher Ferris <cferris@google.com> Tue Jul 14 22:52:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 22:52:40 2015 +0000
tree c5d54ef488a3d6585132daff9f0e0d31571029fe
parent 723611256117f2328101a1db4a7cad8ac8043978
parent a8d82f126d1830ebee99e2622d08489a844e3e62

am a8d82f12: Merge "Update to v3.18.18 kernel headers."

* commit 'a8d82f126d1830ebee99e2622d08489a844e3e62':
  Update to v3.18.18 kernel headers.

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 052997a..d98d2f2 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -381,8 +381,8 @@
   ASSERT_EQ(0, counter2.Value());
   ASSERT_EQ(0, counter3.Value());
 
-  counter2.SetTime(0, 1, 0, 0);
-  usleep(500000);
+  counter2.SetTime(0, 500000000, 0, 0);
+  sleep(1);
 
   EXPECT_EQ(0, counter1.Value());
   EXPECT_EQ(1, counter2.Value());