tree 95bf17f47b337d195308b4366a60a3d85d1d7710
parent 538cdb98ef06a1768c582df28e8cc0e4335dd216
parent 64127efbe65f73a01cf15366e08406bf7cb537d9
author Dirk Dougherty <ddougherty@google.com> 1374268926 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374268926 -0700

am 64127efb: am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev

* commit '64127efbe65f73a01cf15366e08406bf7cb537d9':
  Doc change: Add Colopl video to carousel and spotlight.