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