tree 8b2c38c83f6d24ad3b8697295041586ba91b8deb
parent f356961278c7f1384769d592e2ecacf24d6ad21b
parent 2d81c413c7b0a1206aae4e45d6dd2bbae0584436
author Jean-Baptiste Queru <jbq@google.com> 1296169693 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296169693 -0800

am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"

* commit '2d81c413c7b0a1206aae4e45d6dd2bbae0584436':
  Delete browserplugin sample. do not merge