tree ccf66a82a795d51116485ce03525604ed68a69ee
parent 1d60db8bfce9becee9d101eacc58e2a673221622
parent ed49d7b57e66cc2520817b345ef9de289d688bd4
author Igor Murashkin <iam@google.com> 1369252586 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369252586 -0700

am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev

* commit 'ed49d7b57e66cc2520817b345ef9de289d688bd4':
  camera3: Fix recording failure when switching resolutions while preview on