tree 80152ceb6e6797c6102aa6e67977897bc43a8f76
parent e362f6bba4eaf077981a5d4e29cfcad5d5fee56d
parent 4edc153fe6e44495deaf07e720bccc97d8e3fd07
author Scott Main <smain@google.com> 1361485986 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361485986 -0800

am 4edc153f: am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev

* commit '4edc153fe6e44495deaf07e720bccc97d8e3fd07':
  docs: add image frame style and left-float figure box