tree 8be161142265ae9dec482e89263e7f2901be0110
parent 0f2af74e7e6861402a766301d7f9114f453b0aa1
parent 5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78
author Spike Sprague <spikuru@google.com> 1395350255 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395350255 -0700

am 5cc5f61e: Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali

* commit '5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78':
  video bottom bar stop button tweaking