diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-07 02:18:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:18:42 +0000 |
| commit | 40659dea8eefaa9d7f5b742e3333d68b6f0dd89c (patch) | |
| tree | 53a621f8f1b314c07c0ffff156c25b3981813ab0 /media | |
| parent | 51b7125bd0e2127f1d57938e95523dcc61e657ef (diff) | |
| parent | 47ef192f0296642b901e82d0c72c5a1a0d08f4df (diff) | |
| download | frameworks_av-40659dea8eefaa9d7f5b742e3333d68b6f0dd89c.zip frameworks_av-40659dea8eefaa9d7f5b742e3333d68b6f0dd89c.tar.gz frameworks_av-40659dea8eefaa9d7f5b742e3333d68b6f0dd89c.tar.bz2 | |
am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df':
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
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions