]> git.saurik.com Git - android/aapt.git/commitdiff
Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev
authorRaphael Moll <ralf@android.com>
Mon, 21 May 2012 20:09:29 +0000 (13:09 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 21 May 2012 20:09:29 +0000 (13:09 -0700)

Trivial merge