summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-01-07 23:53:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-07 23:53:26 +0000
commit7810002ad7e5ed895cb94ae7509198a7db35413a (patch)
tree86bcda3fc3c10b7ccc09c764732d0a35a3e60caf
parentcb1fd04e2a0b84f9fa0f68d8c4a5dc3f4f665b75 (diff)
parent8e944e6303d1c952929989f56da6b9d97bb54b3c (diff)
downloadpackages_apps_LegacyCamera-7810002ad7e5ed895cb94ae7509198a7db35413a.zip
packages_apps_LegacyCamera-7810002ad7e5ed895cb94ae7509198a7db35413a.tar.gz
packages_apps_LegacyCamera-7810002ad7e5ed895cb94ae7509198a7db35413a.tar.bz2
am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"
* commit '8e944e6303d1c952929989f56da6b9d97bb54b3c': Loading the corresponding library in LegacyCamera app
-rw-r--r--src/com/android/camera/panorama/MosaicRenderer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/panorama/MosaicRenderer.java b/src/com/android/camera/panorama/MosaicRenderer.java
index f055c0e..f4e9abc 100644
--- a/src/com/android/camera/panorama/MosaicRenderer.java
+++ b/src/com/android/camera/panorama/MosaicRenderer.java
@@ -24,7 +24,7 @@ public class MosaicRenderer
{
static
{
- System.loadLibrary("jni_mosaic");
+ System.loadLibrary("jni_legacymosaic");
}
/**