]> git.saurik.com Git - android/aapt.git/commit
am 82ca5ffb: am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag...
authorRaphael Moll <ralf@android.com>
Mon, 21 May 2012 21:32:24 +0000 (14:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 21:32:24 +0000 (14:32 -0700)
commit30eceed5e2743ff7c799b72d6e508a5a457e09ef
treee5dc4023d80020fa5ab6bc446601d7b8d2363a78
parent9933e5350c2d0d54b464aa509eb948c6b86acddb
parent67f67f6b41a036d958a17f231f907594f7777978
am 82ca5ffb: am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

* commit '82ca5ffb53ff909aa240532ebdfa1f98dc0db178':
  Merge "AAPT: support a new --ignore-assets flag."