OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75ec33e 5ef471c)
am 5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev
authorChristopher Ferris <cferris@google.com>
Tue, 9 Sep 2014 21:56:14 +0000 (21:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 21:56:14 +0000 (21:56 +0000)
* commit '5ef471c5f986a52c681a29856c38f72127cdf8ac':
  Use time() instead of clock() for timeouts.


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