OSDN Git Service

am 6a5a35ed: Merge "Should check the enable plugin settings before accepting the...
authorGrace Kloba <klobag@google.com>
Tue, 19 Jan 2010 08:17:25 +0000 (00:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Jan 2010 08:17:25 +0000 (00:17 -0800)
commit9611825c90fe01b75193ac4163b022178404e1f3
treed80a07776994614888ae093b9b71795f704ce286
parent1a318d002f30c34f2a43bbd33897398ea2966f9c
parent6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a
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