| commit | 413b280dcbd3108a44728aac111035d47409ee77 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:22:52 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:22:52 2012 -0800 |
| tree | ffeb7223cd0fcb786a826cce4da5367a7e4c4461 | |
| parent | 15920fa94559ddff48b0d2e83b5f086c49fb5c67 [diff] | |
| parent | 4844b2068d9f036f9f036da58f2295927c8ee085 [diff] |
am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '4844b2068d9f036f9f036da58f2295927c8ee085': Camera2: Use lower resolutions for front fake camera Camera2: Fix deadlock issues with getInProgressCount EmulatedFakeCamera2: Add features needed for recording support for 320x240, NV21 gralloc: Add automatic format selection