tree b58a677cabd233d3e01102494ad1bcaef14c79d4
parent a9fbc25de14cc936696f689983213d0e431dfc32
parent 8f037002d11affbec6cb5d79d68dfab4ddfe5783
author Lajos Molnar <lajos@google.com> 1418066027 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418066027 +0000

am 8f037002: am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev

* commit '8f037002d11affbec6cb5d79d68dfab4ddfe5783':
  media: run media tests based on device type and support