tree b13f19573bef2bdf99ffb488825693f2c492e804
parent cc8700833bbfd43e9b87b20e8245a137f39987b8
parent 1e24a6f7268fa309b99c7071c05d46113076a400
author Yang Ni <yangni@google.com> 1424455081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424455081 +0000

am 1e24a6f7: Merge "Added rsCpuExecutable.cpp to compatlib build"

* commit '1e24a6f7268fa309b99c7071c05d46113076a400':
  Added rsCpuExecutable.cpp to compatlib build