tree ff961c55730da763f129f028abf07652729807c8
parent f8a5bac7b04daf06f53970efda3509ed6e98e372
parent 3bde0056c5294126bdd79c38873c78c0f7ece781
author Kevin Lin <linkevin@google.com> 1393544078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393544078 +0000

am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec: Added support to choose vertical alignment for image spans.

* commit '07c0fcd10aeb14c6ae9b7edf13176ad35abbb884':
  Added support to choose vertical alignment for image spans.