OSDN Git Service

am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when switching resolu...
authorIgor Murashkin <iam@google.com>
Wed, 22 May 2013 19:58:34 +0000 (12:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 May 2013 19:58:34 +0000 (12:58 -0700)
commitc7722457d9896c10fd33816fbea831852af68330
treecc2ad7494f656937b939ed6d211d98158450d09a
parent65e218ee5249d722a1af0bab6546709f3de62f8c
parentb7337d56a72c9b20abf57e853953126d0aa3dd1a
am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev

* commit 'b7337d56a72c9b20abf57e853953126d0aa3dd1a':
  camera3: Fix recording failure when switching resolutions while preview on
services/camera/libcameraservice/Camera2Client.cpp
services/camera/libcameraservice/Camera2Client.h