]> git.saurik.com Git - android/aapt.git/commitdiff
am 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
authorTor Norbye <tnorbye@google.com>
Tue, 5 Jun 2012 16:55:22 +0000 (09:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 16:55:22 +0000 (09:55 -0700)
* commit '9f374b9de5a557a7977b24d41f45c3464cfff8c1':
  Tweak default ignore-assets path


Trivial merge