tree a11f05ddd0544e622d118b45706763a537df8acb
parent 3faf4c4879c9ec35d464774444b75a2e6b4224a6
parent 3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa
author Jean-Baptiste Queru <jbq@google.com> 1346251267 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346251267 -0700

am 3043b188: Merge "Fix build for x86_64"

* commit '3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa':
  Fix build for x86_64