tree 47ca0d1e40dbcc174e23a1c97b19eee63751a2a3
parent 8b3df1f971dec922aba4df766ae25dc16c660445
parent 2448afdb729bfab4c9e2ac8af124870fd5929a08
author smain@google.com <smain@google.com> 1418846762 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418846762 +0000

am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288

* commit '2448afdb729bfab4c9e2ac8af124870fd5929a08':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145