| commit | 801a07c33d5fe08d9761601614701b8f6cc1597c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 11:11:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 10 11:11:53 2013 -0700 |
| tree | 7834ba41ef91922a0729ff52771a79f2a92bd2f8 | |
| parent | f05aec20748c9b71ffbb35cf0ae10078d297b45d [diff] | |
| parent | 6c72c1877fadca5068fa94f7a0249c0609e85534 [diff] |
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