OSDN Git Service

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


Trivial merge