| commit | 6fd1eea001b70db1507f395957426462d42833a2 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Feb 27 18:16:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 18:16:10 2014 +0000 |
| tree | 5d5e7a22f279f1da5451aab0f5c6113bde446437 | |
| parent | 2fa191d77795e1dfb1985c7b9b08b491b33b1b3a [diff] | |
| parent | 4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa [diff] |
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