tree 1d4211e3cfec5700c5291c9afdd6fce23cd1be89
parent 08298357a2fb8fe9574a32187c68f34ec356e3a8
parent 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a
author Glenn Kasten <gkasten@android.com> 1395263096 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395263096 +0000

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

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