tree 3399f975f090d202bbe99546c8cefd2c020933aa
parent a4dc29a72122f3e52377134039ebdb92b8e4d618
parent 93b3d6658762a84b23cd3421d0f41e4d82693cc3
author Andrew Solovay <asolovay@google.com> 1428007100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428007100 +0000

am 93b3d665: am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs

* commit '93b3d6658762a84b23cd3421d0f41e4d82693cc3':
  docs: Fixed formatting in android:documentLaunchMode syntax section