OSDN Git Service

am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
authorTor Norbye <tnorbye@google.com>
Tue, 5 Jun 2012 15:45:20 +0000 (08:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 15:45:20 +0000 (08:45 -0700)
commit9f374b9de5a557a7977b24d41f45c3464cfff8c1
tree7d2eba9b27fcddaf67d48fa22e1bebc2ff0b6dca
parentb25605cd7111bcab41ec10547f015bd2d6215c91
parent44ff9b8f9294e015031fc9293974604771e5efdd
am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
  Tweak default ignore-assets path
tools/aapt/AaptAssets.cpp