am c3e07f9d: am 606fe528: Merge change Ib4a23918 into eclair-mr2

Merge commit 'c3e07f9d442ba097f264777693938b781e290da4'

* commit 'c3e07f9d442ba097f264777693938b781e290da4':
  Updating sample plugin to test java class loading.