tree 1257afdb6b0568634b4d31f9d993579e8c4ac851
parent 34efb3d5dcb9d1c7552725702ba2cfc905b4c39a
parent e21460858932813a0873f96e1ddc2bc6f36d7c56
author Geremy Condra <gcondra@google.com> 1334252476 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334252476 -0700

am e2146085: (-s ours) am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1

* commit 'e21460858932813a0873f96e1ddc2bc6f36d7c56':
  DO NOT MERGE Fix for CVE-2011-3045