OSDN Git Service

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


Trivial merge