| commit | 2590fc421ccf5e8199d511ff3022b428ee9122e9 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Dec 11 19:24:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 19:24:16 2014 +0000 |
| tree | f489352ca8f9921287babe07829720ccc145d9e7 | |
| parent | 65575de268f4c0d75e6c1172469001ace765fc14 [diff] | |
| parent | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 [diff] |
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)