tree fa501cf7feabda01b4faa65b2711b1c6afbc779f
parent d9643f428db43a9dc8b7363fe9ccf0995a5ed16b
parent f2aef5d805bdd2acb7ffb1f0022c0fb24ad8df69
author Unsuk Jung <unsuk@google.com> 1400781246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400781246 +0000

am f2aef5d8: Merge "Revert "media: AdaptivePlaybackTest: properly handle missing codecs"" into klp-modular-dev

* commit 'f2aef5d805bdd2acb7ffb1f0022c0fb24ad8df69':
  Revert "media: AdaptivePlaybackTest: properly handle missing codecs"