tree dfa760a8b80bb83ebf340dcfbfd4580f1afd8753
parent 3401d00933d7fb23fc1e383ee5ba668e7338c605
parent f518d4e9f71aac4f95539dfa20a694f0c2629e5f
author Lajos Molnar <lajos@google.com> 1441317833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317833 +0000

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

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