| commit | 24fa6a567d02e0901b4bce4d934ccab4f70e41a0 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Mar 07 11:02:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 11:02:18 2014 +0000 |
| tree | 68ac5f1ccd1c53a7ba7da918eec2ea96c5918b94 | |
| parent | b5e2d48cc880e16a8c4fcceb727931f2ad413b21 [diff] | |
| parent | 40659dea8eefaa9d7f5b742e3333d68b6f0dd89c [diff] |
am 40659dea: am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev * commit '40659dea8eefaa9d7f5b742e3333d68b6f0dd89c': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path