commit | cb010a3fa85db1eb90346b35e484e21e7f1b1a4b | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Fri Apr 18 22:11:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 18 22:11:00 2014 +0000 |
tree | 720906051414d27dfca82c175618a83190d9ea3d | |
parent | 77d4f613bbed8b646c8ddade6a0737fcbd391b07 [diff] | |
parent | e1ff1051ffee8fb650741ad133f0f28b73eb7a73 [diff] |
am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues" * commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73': libeffects: 64 bit compile issues