]> git.saurik.com Git - android/aapt.git/commitdiff
am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev
authorRaphael Moll <ralf@android.com>
Mon, 21 May 2012 20:13:38 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 20:13:38 +0000 (13:13 -0700)
* commit '9c06ac09c3530c5f0bc0b47a3350eedb5b539c35':
  Merge "AAPT: support a new --ignore-assets flag."


Trivial merge