OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b46776 9eb142e)
am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
authorGreg Hackmann <ghackmann@google.com>
Fri, 9 May 2014 21:51:51 +0000 (21:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 May 2014 21:51:51 +0000 (21:51 +0000)
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
  Revert "Use asynchronous lock/unlock API"


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