OSDN Git Service

am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)
commit83e5c374ec29859e64347820b38013ecc3aaf935
treeaa6f6324945e19f20918b90bf60768e08239174a
parente4bc8dbf0329c4845c692a02e54c16906998f77d
parentf2d744d9535ca59be6cd878830176f81a0a8fbc6
am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'f2d744d9535ca59be6cd878830176f81a0a8fbc6':
  Camera2/3: Fix deadlock when starting recording before preview.