tree 7834ba41ef91922a0729ff52771a79f2a92bd2f8
parent f05aec20748c9b71ffbb35cf0ae10078d297b45d
parent 6c72c1877fadca5068fa94f7a0249c0609e85534
author The Android Open Source Project <initial-contribution@android.com> 1370887913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370887913 -0700

am 6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '6c72c1877fadca5068fa94f7a0249c0609e85534':
  camera2/3: Fix deadlock take picture while preview callback
  camera3: Fix crash in set error state.
  camera2/3: Add protection to callback processing call