OSDN Git Service

am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 02:19:23 +0000 (18:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 02:19:23 +0000 (18:19 -0800)
commit24bbd72d694083c0cb51fdf719ba079080f31b62
treeaef3aee5cf036f7a8e8ccdc7304579dfaf8c6a41
parent66a9b789703b7fac5f57fa318209dc8211f800f7
parent5d0dd222cef421d5f5bbde0bed3d898e9ca505f1
am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"

* commit '5d0dd222cef421d5f5bbde0bed3d898e9ca505f1':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad