tree 587a1e51c442be5d59dfe739486301b69edd976b
parent 0614e74dcadbb675ba72d9e695824651ce5e9e1f
parent d1f13fb8c864d5830a515c48d9e943ea2ec2b677
author Andreas Gampe <agampe@google.com> 1420857173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420857173 +0000

am d1f13fb8: Merge "PhaseBeam: Force 32bit"

* commit 'd1f13fb8c864d5830a515c48d9e943ea2ec2b677':
  PhaseBeam: Force 32bit