tree 8c0843e89a073bd2e70d7160465fd083b888257c
parent a5153f0cd5ee9b82fa732b9c2d1700ed2dd5acb4
parent 051945986f325a0dfce13a98ade7d1c60cc7d185
author Scott Main <smain@google.com> 1384980366 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384980366 -0800

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

* commit '051945986f325a0dfce13a98ade7d1c60cc7d185':
  add new video button to some pages