OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5f59e3 0019c7b)
am 0019c7b5: resolved conflicts for merge of a0eeb0b6 to lmp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 28 Aug 2014 04:11:48 +0000 (04:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 Aug 2014 04:11:48 +0000 (04:11 +0000)
* commit '0019c7b5a05a7c79e3ab9b72cae9bcdf8d22491e':
  Fix pthread_getattr_np for the main thread.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help