OSDN Git Service

am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
authorXavier Ducrohet <xav@android.com>
Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.


Trivial merge