OSDN Git Service

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


Trivial merge