tree e1378f10feb479cc48dc578a2e0cbd4e2737e27f
parent 7a2d46f39bb47304be4faa63123af3a14a5133d7
parent 3aa4de11b05599d75af92a15820731144941c38f
author Jason Sams <jsams@google.com> 1403133254 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403133254 +0000

am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b