| commit | e21460858932813a0873f96e1ddc2bc6f36d7c56 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Thu Apr 12 10:38:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 12 10:38:56 2012 -0700 |
| tree | 2ea44343e9c8d62a3791b01bd14e9facf889dd2d | |
| parent | 004865ac74c217ae1cd5631559223a399eb3befe [diff] | |
| parent | b4e0b528f5c1856d8d03caff5b47c8a5b4b905b9 [diff] |
am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1 * commit 'b4e0b528f5c1856d8d03caff5b47c8a5b4b905b9': DO NOT MERGE Fix for CVE-2011-3045