am bf677631: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-r… · Evervolv/android_hardware_qcom_camera@a7198ce · GitHub

Commit

am bf67763: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-re…

Browse files

…lease - do not merge

* commit 'bf677631895aa850beb978f2d98d92d80cc65622':
  Camera3: Only delete channel object when one is available
  Camera3: Protect against simultaneous camera instances
  Camera3: Fix JPEG Exif CTS test
  Camera3: Update EXIF tag information
  Camera3: Reset the ROI based on scaler crop region

Loading branch information

The Android Open Source Project authored and Android Git Automerger committed Jun 10, 2013

2 parents f05da97 + bf67763 commit a7198ce