tree 4cb39cdb0b1be3b9c581b10902bee88214418712
parent 02b19843d4fb28103cc4b21aa2017eeca795d87d
parent 6726d6bb1a30167786864c445cbe0370ee0dd58c
author Derek Sollenberger <djsollen@google.com> 1283180796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283180796 -0700

am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread

Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.