Commit 3f944f46 authored Jun 06, 2013 by The Android Open Source Project Committed by Android Git Automerger Jun 06, 2013

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

* commit '25c8c528':
  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.

parents 7f616d3c 25c8c528

There are no changes