commit | 956d4c702bc71873db40829169556d75fc4aa75e | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Wed Mar 06 18:10:47 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 06 18:10:47 2013 -0800 |
tree | 16c669af2f21d9cbc58c5abbb754e18429668f1d | |
parent | 116c59bbb7220c64d362d55463083b51db2f687c [diff] | |
parent | 373318caf6234dcb3c9f2f5a19bc8528980adcec [diff] |
am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev * commit '373318caf6234dcb3c9f2f5a19bc8528980adcec':