| commit | c5ac2140cad524c0df13aafb82211bef3068580d | [log] [tgz] |
|---|---|---|
| author | Dave Burke <daveburke@google.com> | Wed Apr 04 15:10:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 04 15:10:18 2012 -0700 |
| tree | 2ea44343e9c8d62a3791b01bd14e9facf889dd2d | |
| parent | 0447346b2a9d342012231b08dd9a62a630abdc3b [diff] | |
| parent | 004865ac74c217ae1cd5631559223a399eb3befe [diff] |
am 004865ac: (-s ours) am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026 * commit '004865ac74c217ae1cd5631559223a399eb3befe': DO NOT MERGE Fix for CVE-2011-3026
