| commit | ff23e7600aac71894e026a15b0b559af9487d1d8 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Feb 27 02:42:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 02:42:31 2014 +0000 |
| tree | 959ccca27582ad90f7b794104cd7d3161d666974 | |
| parent | 70543d378ed74debdc0fc3c84b3b269ebc713dfa [diff] | |
| parent | 46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2 [diff] |
am 46335a65: (-s ours) am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" * commit '46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2': DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad