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)
commit4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa
treed4b05445048f72d0aef3623a957c2d449e516151
parent3fd8a4feae8c384ea04ce50452092a0079553f0e
parent65f05c6327f3e99144a206b4d9b9d28f133a7108
am 65f05c63: am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"

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