OSDN Git Service

am 25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:38:56 +0000 (10:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 17:38:56 +0000 (10:38 -0700)
commit3f944f46a6a35034a7f5e0058134df9ebfc41e43
tree3e0ec5b23d861c03b8342c114649b1688cbe9909
parent7f616d3cc5366a4b8af20d3d0c768e3de1df0666
parent25c8c528101360119f2aafc1871811cc1a5ad519
am 25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '25c8c528101360119f2aafc1871811cc1a5ad519':
  Camera2/3: Move recording frame processing to its own thread.
  stagefright: Fix port-reconfiguration & output-buffer-filled race condition
  Camera2/3: Don't trigger AF when in INFINITY focus mode.