diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-07 03:10:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 03:10:01 +0000 |
| commit | da7ad468d9b86132f7546988324663c47cc0381c (patch) | |
| tree | 82179956497841fb82a52cd7bc9c917d1c10a58c /media | |
| parent | f1cfb222e68373a182092f60c19f26075b1b722f (diff) | |
| parent | 4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce (diff) | |
| download | frameworks_base-da7ad468d9b86132f7546988324663c47cc0381c.zip frameworks_base-da7ad468d9b86132f7546988324663c47cc0381c.tar.gz frameworks_base-da7ad468d9b86132f7546988324663c47cc0381c.tar.bz2 | |
am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce':
libexif is now libjhead
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 35327c0..6522eea 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ libcamera_client \ libmtp \ libusbhost \ - libexif \ + libjhead \ libstagefright_amrnb_common \ LOCAL_REQUIRED_MODULES := \ |