commit cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a
author Jesse Hall <jessehall@google.com> Wed May 01 02:30:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 01 02:30:48 2013 +0000
tree 50181664462c55422c5d5773a0ed9ef9dd549ae2
parent 5d46b04bd5a8ec00ea527b68aa48907d3978a007
parent 46fc9cb60cdbd44f4f42966d37babc8a1bc1263d

Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

opengl/specs/EGL_ANDROID_presentation_time.txt

diff --git a/opengl/specs/EGL_ANDROID_presentation_time.txt b/opengl/specs/EGL_ANDROID_presentation_time.txt
index 03370ed..09b3938 100644
--- a/opengl/specs/EGL_ANDROID_presentation_time.txt
+++ b/opengl/specs/EGL_ANDROID_presentation_time.txt
@@ -107,8 +107,8 @@
     presentation time when an absolute time is needed be queried on Android?
 
     RESOLVED: The current clock value can be queried from the Java
-    SystemClock#uptimeMillis() method or from the native clock_gettime
-    function by passing CLOCK_MONOTONIC as the clock identifier.
+    System.nanoTime() method, or from the native clock_gettime function by
+    passing CLOCK_MONOTONIC as the clock identifier.
 
 Revision History