OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fa3264 ff23e76)
am ff23e760: am 46335a65: (-s ours) am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 02:45:23 +0000 (18:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 02:45:23 +0000 (18:45 -0800)
* commit 'ff23e7600aac71894e026a15b0b559af9487d1d8':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad


Trivial merge
build
About OSDN
Find Software
Develop Software
Help