| commit | 4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Feb 27 18:12:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 18:12:38 2014 +0000 |
| tree | d4b05445048f72d0aef3623a957c2d449e516151 | |
| parent | 3fd8a4feae8c384ea04ce50452092a0079553f0e [diff] | |
| parent | 65f05c6327f3e99144a206b4d9b9d28f133a7108 [diff] |
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