tree 4fab5f7c608fccc81422a7b44284e8966689fd4e
parent dfc239ce8692b542048670927bf7d46d9527d32f
parent 589b4b3ea983aab1825cb1aea24d072a4a757b70
author Scott Main <smain@google.com> 1362685532 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362685532 -0800

am 589b4b3e: am 956d4c70: am 373318ca: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev

* commit '589b4b3ea983aab1825cb1aea24d072a4a757b70':