OSDN Git Service

am 6fd1eea0: am 4086cc6b: (-s ours) am 65f05c63: am a0bea538: (-s ours) am 031bff45...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 18:18:59 +0000 (10:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 18:18:59 +0000 (10:18 -0800)
* commit '6fd1eea001b70db1507f395957426462d42833a2':
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok


Trivial merge