diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-04-18 22:11:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 22:11:00 +0000 |
commit | cb010a3fa85db1eb90346b35e484e21e7f1b1a4b (patch) | |
tree | 720906051414d27dfca82c175618a83190d9ea3d /include/media/mediascanner.h | |
parent | 77d4f613bbed8b646c8ddade6a0737fcbd391b07 (diff) | |
parent | e1ff1051ffee8fb650741ad133f0f28b73eb7a73 (diff) | |
download | frameworks_av-cb010a3fa85db1eb90346b35e484e21e7f1b1a4b.zip frameworks_av-cb010a3fa85db1eb90346b35e484e21e7f1b1a4b.tar.gz frameworks_av-cb010a3fa85db1eb90346b35e484e21e7f1b1a4b.tar.bz2 |
am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"
* commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73':
libeffects: 64 bit compile issues
Diffstat (limited to 'include/media/mediascanner.h')
0 files changed, 0 insertions, 0 deletions