tree 37ef0f2e9d087ad6fbfd60ea8fd18f4db85d05a9
parent eae4e2ee8ee652e658a46bdfb56b055385a9f033
parent 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a
author Glenn Kasten <gkasten@android.com> 1395263133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395263133 +0000

am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
  libstagefright is no longer 32 bit only.