]> git.saurik.com Git - android/aapt.git/commitdiff
am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
authorXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows


Trivial merge