tree 9e72ad211356e1d63a6c3af40b2bfdc660f78927
parent b924cd07bd81ab46bbdfeb5a15aa206529c5a6a1
parent 52f34da50eee234241448e3c89ba9a280c42e062
author Jean-Baptiste Queru <jbq@google.com> 1281546476 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281546476 -0700

am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"

Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines