tree c1ba6a86d2dd8c9e325d68ccceffeb219341048f
parent 233c43c331e090ab8c15daccd5dcb9ce577996fb
parent fa1b09a7b3f546bd5b30233b1e3f62a6fa7d4a4b
author Teng-Hui Zhu <ztenghui@google.com> 1300487434 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300487434 -0700

am fa1b09a7: am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1

* commit 'fa1b09a7b3f546bd5b30233b1e3f62a6fa7d4a4b':
  Asset for video poster