tree 14633b61cdf261b8d87a2968dc8fa0610e7a8dd8
parent 3db8b1f24d8266e24797a5095521521f177f4809
parent c8d9bc29aaede1f104c6faed095a4c636bbe5748
author Eino-Ville Talvala <etalvala@google.com> 1349810158 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349810158 -0700

am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev

* commit 'd016cf5b12cb73bd49bcecb0d5a4958df23620c3':
  Camera2: Move non-ZSL shutter sound firing to be later.