tree c01682bda5f56bb7ea385f216958df8cc3815c74
parent 1b5b44ef030bf07fcf7abe7eb844913c5d612f5f
parent ffe9978acc6261a9c411d156f9d9407d4fc12435
author Bryan Mawhinney <bryanmawhinney@google.com> 1389645489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389645489 -0800

am ffe9978a: am 344fe757: am 9dd3e2c2: Basic test of MediaCodecInfo.CodecCapabilities

* commit 'ffe9978acc6261a9c411d156f9d9407d4fc12435':
  Basic test of MediaCodecInfo.CodecCapabilities