tree a4c803ecda0a5ddb4655ba135e175d1f57f3d17c
parent ffd353a73eb7794ef556c4e646f866b580a03abb
parent cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba
author Mark Salyzyn <salyzyn@google.com> 1394724370 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394724370 +0000

am cdbf28b3: Merge "native frameworks: 64-bit compile issues"

* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
  native frameworks: 64-bit compile issues