tree 1a73ff366d52dbf0def324f811e5bcd805af7a38
parent 3fe55c6390f37c2fdf2d0dc6dc96d6be6b98bfea
parent 34cadcd504ecc7ca6b5eafc162fff5345f973219
author Kevin Ma <kma@google.com> 1402696240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402696240 +0000

am 34cadcd5: am 6853e065: Merge "Added a check on supported codecs. If none is available for the video  being tested in testGetThumbnail, simply return." into klp-modular-dev

* commit '34cadcd504ecc7ca6b5eafc162fff5345f973219':
  Added a check on supported codecs. If none is available for the video  being tested in testGetThumbnail, simply return.