OSDN Git Service

am 46335a65: (-s ours) am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 02:42:31 +0000 (02:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 02:42:31 +0000 (02:42 +0000)
commitff23e7600aac71894e026a15b0b559af9487d1d8
tree959ccca27582ad90f7b794104cd7d3161d666974
parent70543d378ed74debdc0fc3c84b3b269ebc713dfa
parent46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2
am 46335a65: (-s ours) am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"

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