OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 500c086 11c13ab)
am 11c13abd: Merge "Use time() instead of clock() for timeouts."
authorChristopher Ferris <cferris@google.com>
Tue, 9 Sep 2014 22:54:12 +0000 (22:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 22:54:12 +0000 (22:54 +0000)
* commit '11c13abd56693d4a4be3ca9e14cbaa456ba586b9':
  Use time() instead of clock() for timeouts.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help