tree c38c0193e7e4545e3c6272e45e20481885796787
parent cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633
parent 4b905ad4368b9499238e975b670dd464586d6dd4
author Eino-Ville Talvala <etalvala@google.com> 1418066258 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418066258 +0000

am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.