tree 9f8fe2f3ff43064b9bf2f71cd3e0a92fa0560267
parent 1e148f509eda581b8ef7cf77acad7f9216034891
parent c205a9d68c23e9ade2cbe28bba0f257d84d23a97
author Xavier Ducrohet <xav@android.com> 1328557370 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328557370 -0800

am c205a9d6: am f8aea993: Make aapt ignore tools-related data.

* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.