summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
commitda7ad468d9b86132f7546988324663c47cc0381c (patch)
tree82179956497841fb82a52cd7bc9c917d1c10a58c
parentf1cfb222e68373a182092f60c19f26075b1b722f (diff)
parent4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce (diff)
am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce': libexif is now libjhead
-rw-r--r--media/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 35327c0a3be7..6522eeafd732 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 := \