| commit | b983bc16456e66b98934ef7d624cff4e7047020c | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri May 23 19:43:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 19:43:45 2014 +0000 |
| tree | 175561d2bfb5c3081bd3c8f82f119a45fcced9ce | |
| parent | 8c8c75c8692e816efcecae69c0f30f4b8dd3e042 [diff] | |
| parent | b3b0b3bfdf93f697f8b209801c6f13217de0ad6b [diff] |
am b3b0b3bf: (-s ours) am bead3a8c: Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into klp-modular-dev * commit 'b3b0b3bfdf93f697f8b209801c6f13217de0ad6b': DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs