OSDN Git Service

am 64127efb: am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to...
authorDirk Dougherty <ddougherty@google.com>
Fri, 19 Jul 2013 21:22:06 +0000 (14:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jul 2013 21:22:06 +0000 (14:22 -0700)
commit2289382cfa07535b52db114ed3dc5a95c7fd63ce
tree95bf17f47b337d195308b4366a60a3d85d1d7710
parent538cdb98ef06a1768c582df28e8cc0e4335dd216
parent64127efbe65f73a01cf15366e08406bf7cb537d9
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.