am 28512f66: Merge "Add android:onClick methods to proguard.flags" into ics-mr0

* commit '28512f6648f24c423eac3740bc0b7e13a60dc638':
  Add android:onClick methods to proguard.flags