OSDN Git Service

am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert...
authorJP Abgrall <jpa@google.com>
Thu, 27 Feb 2014 18:09:15 +0000 (18:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 18:09:15 +0000 (18:09 +0000)
commit65f05c6327f3e99144a206b4d9b9d28f133a7108
treed4b05445048f72d0aef3623a957c2d449e516151
parent529a772eecc7a2ce1c916286d742f4f3a32e0d98
parenta0bea538ae0511a24202d6b952b7e7bb8a606ac8
am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"

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