tree 86c64d116eaac51929862972aad138d36860b474
parent 7ba0b4c0e2acd137355188b202da4fcb5d67707f
parent 4efba7e4b452ee715b586151b7b9e6a94c21b5a3
author Android (Google) Code Review <android-gerrit@google.com> 1242777089 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242777089 -0700

Merge change 2016 into donut

* changes:
  Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.