| commit | 2289382cfa07535b52db114ed3dc5a95c7fd63ce | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri Jul 19 14:22:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 19 14:22:06 2013 -0700 |
| tree | 95bf17f47b337d195308b4366a60a3d85d1d7710 | |
| parent | 538cdb98ef06a1768c582df28e8cc0e4335dd216 [diff] | |
| parent | 64127efbe65f73a01cf15366e08406bf7cb537d9 [diff] |
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.