]> git.saurik.com Git - android/aapt.git/commitdiff
am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for...
authorDianne Hackborn <hackbod@google.com>
Mon, 21 May 2012 21:29:14 +0000 (14:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 21:29:14 +0000 (14:29 -0700)
* commit '72669b5f4663937b09d33f9d951f0b86a03fa98b':
  Add aapt support for generating proguard rules for onClick methods.


Trivial merge