diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-07 02:00:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:00:59 +0000 |
| commit | 47ef192f0296642b901e82d0c72c5a1a0d08f4df (patch) | |
| tree | c5f4c0f2f679652f37926469de0c180bb1fbd2b5 /media/libstagefright/MPEG2TSWriter.cpp | |
| parent | bfc260667e566d4ea29c8b1d089b95ce2c11890c (diff) | |
| parent | a11111f9135c98cf4247bbd1a61d7df3053e549e (diff) | |
| download | frameworks_av-47ef192f0296642b901e82d0c72c5a1a0d08f4df.zip frameworks_av-47ef192f0296642b901e82d0c72c5a1a0d08f4df.tar.gz frameworks_av-47ef192f0296642b901e82d0c72c5a1a0d08f4df.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/MPEG2TSWriter.cpp')
0 files changed, 0 insertions, 0 deletions