Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev

automerge: 68ced89

* commit '68ced89949fc1cce198f25e09bf9bdb12616a98c':
  Frameworks/base: Right transform in DngCreator

core/jni/android_hardware_camera2_DngCreator.cpp

@@ -1278,7 +1278,7 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
             }
 
             BAIL_IF_INVALID(writer->addEntry(TAG_CAMERACALIBRATION2, entry2.count,
-                    calibrationTransform1, TIFF_IFD_0),  env, TAG_CAMERACALIBRATION2, writer);
+                    calibrationTransform2, TIFF_IFD_0),  env, TAG_CAMERACALIBRATION2, writer);
         }
     }