tree 30e31f131627e16d62b2396d8ed23f850366af1a
parent a66527c5c871824ce346979c69e03f707abe48bf
parent 344fe7578c20971a034cb7ea7f88ead7e39571dc
author Bryan Mawhinney <bryanmawhinney@google.com> 1389645296 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389645296 -0800

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

* commit '344fe7578c20971a034cb7ea7f88ead7e39571dc':
  Basic test of MediaCodecInfo.CodecCapabilities