summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-07 01:26:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 01:26:10 +0000
commit233e7e9f64be5e85196dd959824bce9a69b2fd99 (patch)
tree041d538c4c72cd9cf5a96612aeab9fe4831e6598
parent278fa87cc9a5e08d410c5b1e6c75afcffc22a988 (diff)
parent98a6bcf433fc23c343343b04c57c5a68d0177ac7 (diff)
downloadframeworks_base-233e7e9f64be5e85196dd959824bce9a69b2fd99.zip
frameworks_base-233e7e9f64be5e85196dd959824bce9a69b2fd99.tar.gz
frameworks_base-233e7e9f64be5e85196dd959824bce9a69b2fd99.tar.bz2
am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '98a6bcf433fc23c343343b04c57c5a68d0177ac7': ExifInterface: fix class load failure
-rw-r--r--media/java/android/media/ExifInterface.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 20eb356..9db35fc 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -98,7 +98,7 @@ public class ExifInterface {
private static SimpleDateFormat sFormatter;
static {
- System.loadLibrary("exif_jni");
+ System.loadLibrary("jhead_jni");
sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
}