commit 9f374b9de5a557a7977b24d41f45c3464cfff8c1
author Tor Norbye <tnorbye@google.com> Tue Jun 05 08:45:20 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 05 08:45:20 2012 -0700
tree 7d2eba9b27fcddaf67d48fa22e1bebc2ff0b6dca
parent b25605cd7111bcab41ec10547f015bd2d6215c91
parent 44ff9b8f9294e015031fc9293974604771e5efdd

am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
  Tweak default ignore-assets path

tools/aapt/AaptAssets.cpp

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index f2fa3f5..46b8a27 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -58,7 +58,7 @@
 
 // The default to use if no other ignore pattern is defined.
 const char * const gDefaultIgnoreAssets =
-    "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~";
+    "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~";
 // The ignore pattern that can be passed via --ignore-assets in Main.cpp
 const char * gUserIgnoreAssets = NULL;