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)
commitf859eae6d8aad3bdd7197eaabdc1804f0e352d7a
tree32ad1f33702bf9ce22a3ddd6e0a5c3d7a228b2c2
parent7bdca9affd174a310de0ff39ec2a257fde55d832
parent6fd1eea001b70db1507f395957426462d42833a2
am 6fd1eea0: am 4086cc6b: (-s ours) am 65f05c63: am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"

* commit '6fd1eea001b70db1507f395957426462d42833a2':
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok