tree aa73bef729c1e64a6b156207fd9b904c655e07af
parent f15b3db3eb69683d23f379697cf86f8487845847
parent eb52fb32297219efbd6add01586f06f32b260c58
author Teng-Hui Zhu <ztenghui@google.com> 1300487242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300487242 -0700

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

* commit 'eb52fb32297219efbd6add01586f06f32b260c58':
  Asset for video poster