| commit | a11111f9135c98cf4247bbd1a61d7df3053e549e | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Mar 07 01:40:59 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 07 01:40:59 2014 +0000 |
| tree | e0603972793777c7a190dd2a1c3c76336098a064 | |
| parent | ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258 [diff] | |
| parent | a413dd621966044753a8fa1f57c76d847b6f4bec [diff] |
Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev * changes: 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