| commit | 3f944f46a6a35034a7f5e0058134df9ebfc41e43 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:38:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:38:56 2013 -0700 |
| tree | 3e0ec5b23d861c03b8342c114649b1688cbe9909 | |
| parent | 7f616d3cc5366a4b8af20d3d0c768e3de1df0666 [diff] | |
| parent | 25c8c528101360119f2aafc1871811cc1a5ad519 [diff] |
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.