]> git.saurik.com Git - android/aapt.git/commitdiff
am f67f834a: am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env...
authorRaphael Moll <ralf@android.com>
Mon, 21 May 2012 21:27:08 +0000 (14:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 21:27:08 +0000 (14:27 -0700)
* commit 'f67f834a9cb7ee9b743e79af85cb42bd45b5aa23':
  Support a new ANDROID_AAPT_IGNORE env var.


Trivial merge