| commit | 6d2ffabfea5bdaee82dff39b30788bfaa274cf51 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Mar 07 19:00:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 19:00:35 2014 +0000 |
| tree | a8ed13a67e2dcb2e8816d4c3c0e129a9d3389f51 | |
| parent | 1fa850466c16cdee2d7a04c60376beb1572162c2 [diff] | |
| parent | d1d45fe7779e10e381420c63de79001c8593423b [diff] |
am d1d45fe7: am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev * commit 'd1d45fe7779e10e381420c63de79001c8593423b': stagefright: use CODECS field in EXT-X_STREAM-INF as fallback