tree 060539ca5ee12b5ea9d43c95007d289d667b7426
parent 1b06736d96d8bdfb8e2ebf89dacba88ed3965032
parent 1364101067072c2ce6fa395cdef2534f338f30b1
author Elliott Hughes <enh@google.com> 1412800797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412800797 +0000

am 13641010: Merge "Fix compile-time tests for LP64."

* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
  Fix compile-time tests for LP64.