OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7d1233 8c49ad6)
am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 02:25:04 +0000 (02:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 02:25:04 +0000 (02:25 +0000)
* commit '8c49ad68b0e35a85ff71dc8d5b6f195e07fb718a':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad


Trivial merge
build
About OSDN
Find Software
Develop Software
Help