OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25e3f4a 98ae1a8)
am 98ae1a85: am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
authorNick Kralevich <nnk@google.com>
Tue, 22 Jan 2013 21:46:31 +0000 (13:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jan 2013 21:46:31 +0000 (13:46 -0800)
* commit '98ae1a85b057f6534bee7e52897a80694ba8b2e1':
  bionic_auxv.h: fix #define conflict


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help