am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard...
am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev
* commit '72669b5f':
Add aapt support for generating proguard rules for onClick methods.