| commit | 24bbd72d694083c0cb51fdf719ba079080f31b62 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Wed Feb 26 18:19:23 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 18:19:23 2014 -0800 |
| tree | aef3aee5cf036f7a8e8ccdc7304579dfaf8c6a41 | |
| parent | 66a9b789703b7fac5f57fa318209dc8211f800f7 [diff] | |
| parent | 5d0dd222cef421d5f5bbde0bed3d898e9ca505f1 [diff] |
am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" * commit '5d0dd222cef421d5f5bbde0bed3d898e9ca505f1': DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad