am 04165371: am 20b39471: Merge change 26933 into eclair

Merge commit '041653714524b37972169071e7569d2432ae8747'

* commit '041653714524b37972169071e7569d2432ae8747':
  AAPT: Ignore visual source safe files in resources

tools/aapt/AaptAssets.cpp

@@ -55,6 +55,7 @@ static bool validateFileName(const char* fileName)
 
 static bool isHidden(const char *root, const char *path)
 {
+    const char *ext  = NULL;
     const char *type = NULL;
 
     // Skip all hidden files.
@@ -83,6 +84,9 @@ static bool isHidden(const char *root, const char *path)
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected emacs backup files.
         type = "backup";
+    } else if ((ext = strrchr(path, '.')) != NULL && strcmp(ext, ".scc") == 0) {
+        // Skip VisualSourceSafe files and don't chatter about it
+        return true;
     } else {
         // Let everything else through.
         return false;