tree bdff10f0c172c20e9ae08c6cc478ee53c87637fc
parent 43fac87f2a8f4843614a5784b830801a90f30150
parent 2a32771ace5250ec919a08da688e2d6c91e5c132
author Raph Levien <raph@google.com> 1380924613 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380924613 -0700

am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev

* commit '2a32771ace5250ec919a08da688e2d6c91e5c132':
  Fix Text appears on top of existing text when composing in gmail.