From: Mark Salyzyn <salyzyn@google.com>
Date: Fri, 18 Apr 2014 22:11:00 +0000 (+0000)
Subject: am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"
X-Git-Tag: android-x86-6.0-r1~2216
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb010a3fa85db1eb90346b35e484e21e7f1b1a4b;p=android-x86%2Fframeworks-av.git

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

* commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73':
  libeffects: 64 bit compile issues
---

cb010a3fa85db1eb90346b35e484e21e7f1b1a4b