tree d3ab7b42eae95f1b0ea7b186adf4a1def484babf
parent 2cb8dfb33d4adc0253d4fa26788f9227104e3d50
parent 029c3152d1957b239f3c650909f39824957d393b
author Xavier Ducrohet <xav@android.com> 1311213188 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311213188 -0700

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

* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
  Fix to compile for windows