OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ef83bc 244bee5)
am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
authorNick Kralevich <nnk@google.com>
Tue, 22 Jan 2013 21:38:53 +0000 (13:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jan 2013 21:38:53 +0000 (13:38 -0800)
* commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0':
  bionic_auxv.h: fix #define conflict


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help