commit 3136623600a9488859ed7c1681b084ea8315ed50
author Elliott Hughes <enh@google.com> Tue May 14 14:59:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 14 14:59:15 2013 -0700
tree f5ffd0ceb90343367cea14af57e8d13e8db7de8b
parent 91cc8014e8cbc5ebfa90708f77f4f319e553a904
parent e1c58ab5bb6284b3e3a2d0e54c295a93780b3f70

am e1c58ab5: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"

* commit 'e1c58ab5bb6284b3e3a2d0e54c295a93780b3f70':
  libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR

libc/include/time.h

diff --git a/libc/include/time.h b/libc/include/time.h
index edcc5bd..8995585 100644
--- a/libc/include/time.h
+++ b/libc/include/time.h
@@ -101,8 +101,9 @@
 #define CLOCK_MONOTONIC            1
 #define CLOCK_PROCESS_CPUTIME_ID   2
 #define CLOCK_THREAD_CPUTIME_ID    3
-#define CLOCK_REALTIME_HR          4
-#define CLOCK_MONOTONIC_HR         5
+#define CLOCK_MONOTONIC_RAW        4
+#define CLOCK_REALTIME_COARSE      5
+#define CLOCK_MONOTONIC_COARSE     6
 #define CLOCK_BOOTTIME             7
 #define CLOCK_REALTIME_ALARM       8
 #define CLOCK_BOOTTIME_ALARM       9