tree 6b574399fe937e834584bec3bc6bea4614fb3e19
parent 84be06e4ce0778fbf0c1ac72f94795ef8433439b
parent 3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed
author Xavier Ducrohet <xav@android.com> 1311213321 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311213321 -0700

am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"

* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows