From: Grace Kloba <klobag@google.com>
Date: Tue, 19 Jan 2010 08:17:25 +0000 (-0800)
Subject: am 6a5a35ed: Merge "Should check the enable plugin settings before accepting the... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9611825c;p=android-x86%2Fexternal-webkit.git

am 6a5a35ed: Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2

Merge commit '6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a' into eclair-mr2-plus-aosp

* commit '6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a':
  Should check the enable plugin settings before accepting
---

9611825c90fe01b75193ac4163b022178404e1f3