tree 9a8cf94ee0f6ff3033cb4be2119ece5591220d0c
parent f5f24006f7bd997c6bca00804ec0f35bddd7ccc2
parent e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f
author Mark Salyzyn <salyzyn@google.com> 1397858944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397858944 +0000

am e0f20cea: Merge "libeffects: 64 bit compile issues"

* commit 'e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f':
  libeffects: 64 bit compile issues