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