| commit | a0bea538ae0511a24202d6b952b7e7bb8a606ac8 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Feb 27 10:07:00 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 10:07:00 2014 -0800 |
| tree | c745d3f398c4c7b658a8e8f317559de6df503f22 | |
| parent | a90e346c24d498af57360bd92ff738a1480f0598 [diff] | |
| parent | 031bff45d051b0cdfcfdca4e35a3ab213e105fce [diff] |
am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok" * commit '031bff45d051b0cdfcfdca4e35a3ab213e105fce': DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok