commit | 589b4b3ea983aab1825cb1aea24d072a4a757b70 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Thu Mar 07 11:42:41 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 11:42:41 2013 -0800 |
tree | 16c669af2f21d9cbc58c5abbb754e18429668f1d | |
parent | e28696da0ab977dbf4823c2e5a4d1355fe516a32 [diff] | |
parent | 956d4c702bc71873db40829169556d75fc4aa75e [diff] |
am 956d4c70: am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev * commit '956d4c702bc71873db40829169556d75fc4aa75e':