]> git.saurik.com Git - android/aapt.git/commitdiff
am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
authorXavier Ducrohet <xav@android.com>
Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)
* commit '3d4db0dc1803252b924076f7d10d8e806af71824':
  Make aapt ignore tools-related data.


Trivial merge