OSDN Git Service

am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 18:07:00 +0000 (10:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 18:07:00 +0000 (10:07 -0800)
* commit '031bff45d051b0cdfcfdca4e35a3ab213e105fce':
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok


Trivial merge