| commit | 47be393e5e98187e6527439291a3f4d2ba31d2d4 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Mar 07 19:00:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 19:00:34 2014 +0000 |
| tree | a8ed13a67e2dcb2e8816d4c3c0e129a9d3389f51 | |
| parent | 3a06522fd0e74934acb4bacaf1e90209bc7e9aa8 [diff] | |
| parent | 6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0 [diff] |
am 6fefae26: (-s ours) am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev * commit '6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0': stagefright: Fix issue with tracking media format in packet source