tree 56cd474eb51d1c1f80cde02a4217937e3081db91
parent ea9e6d24a458c06df6237fddd22b6165b2f92cb5
parent ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6
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