OSDN Git Service

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)
commit46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2
tree754775ba2cf4928a4125534d459cd1c2b0e111a5
parentf7d12336f5aacf715636519363651ab9050abf8f
parent8c49ad68b0e35a85ff71dc8d5b6f195e07fb718a
am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"

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