summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-07 01:35:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 01:35:35 +0000
commit6cc044b0b0a095249f3929975bb7bd2f765c1327 (patch)
treefef40779bcc1b5e89b6c2005b39cb731bd9baa81 /media
parent8b776e8616ebbf49ae0bfcc79d74d32c560016b1 (diff)
parentb2c45abc1d6f791f254c2cf6affcfc4f564d9cd2 (diff)
downloadframeworks_base-6cc044b0b0a095249f3929975bb7bd2f765c1327.zip
frameworks_base-6cc044b0b0a095249f3929975bb7bd2f765c1327.tar.gz
frameworks_base-6cc044b0b0a095249f3929975bb7bd2f765c1327.tar.bz2
am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit 'b2c45abc1d6f791f254c2cf6affcfc4f564d9cd2': ExifInterface: fix class load failure
Diffstat (limited to 'media')
-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"));
}