OSDN Git Service

am 4086cc6b: (-s ours) am 65f05c63: am a0bea538: (-s ours) am 031bff45: (-s ours...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 18:16:10 +0000 (18:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 18:16:10 +0000 (18:16 +0000)
commit6fd1eea001b70db1507f395957426462d42833a2
tree5d5e7a22f279f1da5451aab0f5c6113bde446437
parent2fa191d77795e1dfb1985c7b9b08b491b33b1b3a
parent4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa
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 '4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa':
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok