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