diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-11 19:24:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 19:24:16 +0000 |
| commit | 2590fc421ccf5e8199d511ff3022b428ee9122e9 (patch) | |
| tree | f489352ca8f9921287babe07829720ccc145d9e7 /media/libeffects | |
| parent | 65575de268f4c0d75e6c1172469001ace765fc14 (diff) | |
| parent | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 (diff) | |
| download | frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.zip frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.tar.gz frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.tar.bz2 | |
am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp
* commit '3e08ca6709b5a75dc3b779cf3eba8196b08a0245':
stagefright: misc fixes to software video encoders (and decoders)
Diffstat (limited to 'media/libeffects')
0 files changed, 0 insertions, 0 deletions