tree d53cbd3be07ea808b6147a8957e9fb72e425ff36
parent 3e0dfecb0835a6945f5a352d46308f0844303643
parent 4dcf23b6f50aa5c43e6c7e86cb4b14caa669e954
author Scott Main <smain@google.com> 1384980101 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384980101 -0800

am 4dcf23b6: am 64fedb77: add new video button to some pages

* commit '4dcf23b6f50aa5c43e6c7e86cb4b14caa669e954':
  add new video button to some pages