| commit | 47ef192f0296642b901e82d0c72c5a1a0d08f4df | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Mar 07 02:00:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 02:00:59 2014 +0000 |
| tree | c5f4c0f2f679652f37926469de0c180bb1fbd2b5 | |
| parent | bfc260667e566d4ea29c8b1d089b95ce2c11890c [diff] | |
| parent | a11111f9135c98cf4247bbd1a61d7df3053e549e [diff] |
am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': 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