| commit | 46cc4dbb38968dadffcc5f78dd69d391768711e1 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri Jul 19 13:33:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 19 13:33:46 2013 -0700 |
| tree | 330964d2304e782aabcebe5bab56bcc0e6b6a17b | |
| parent | b5bf655cc6cc9128aec99958cce3b054348c9273 [diff] | |
| parent | e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54 [diff] |
am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev * commit 'e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54': Doc change: Add Colopl video to carousel and spotlight.