tree 1ab369690559e76aab3d8b67a470b223c995c934
parent 371dbcba11070ed2fdd58a4c328b5d7b9ad65a40
parent e37ab63221af94d69437741a3645fc0e14a680bc
author Jean-Baptiste Queru <jbq@google.com> 1281546271 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281546271 -0700

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

Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

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