am 131bf0b0: am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread

Merge commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb'

* commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb':
  Disable Proguard for the SampleBrowerPlugin