summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-01-07 23:53:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-07 23:53:24 +0000
commitcb1fd04e2a0b84f9fa0f68d8c4a5dc3f4f665b75 (patch)
treefeca1f202b842489ec6c454a3d255760d4ac5b8d
parent4df99f37a4884bc57f1d1e9bf51e3bb44e7886d9 (diff)
parentbe2086dee3fac7f0a07d329021bfa7cb449d916b (diff)
downloadLegacyCamera-cb1fd04e2a0b84f9fa0f68d8c4a5dc3f4f665b75.zip
LegacyCamera-cb1fd04e2a0b84f9fa0f68d8c4a5dc3f4f665b75.tar.gz
LegacyCamera-cb1fd04e2a0b84f9fa0f68d8c4a5dc3f4f665b75.tar.bz2
am be2086de: Merge "Fix the loading library issue of panorama mode in Legacycamera app"
* commit 'be2086dee3fac7f0a07d329021bfa7cb449d916b': Fix the loading library issue of panorama mode in Legacycamera app
-rw-r--r--src/com/android/camera/panorama/Mosaic.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/panorama/Mosaic.java b/src/com/android/camera/panorama/Mosaic.java
index 5064cec..90bf2ad 100644
--- a/src/com/android/camera/panorama/Mosaic.java
+++ b/src/com/android/camera/panorama/Mosaic.java
@@ -93,7 +93,7 @@ public class Mosaic {
static {
- System.loadLibrary("jni_mosaic");
+ System.loadLibrary("jni_legacymosaic");
}
/**