tree cabe635322418634e7e2e668c8c919bc36103a6d
parent 2fe8ebbb389cd6fa678ccf633145f5c3b878bedc
parent 1d2cbecc842326348c9650dc523abedd893d9d1f
author Kevin Hufnagle <khufnagle@google.com> 1469463267 +0000
committer android-build-merger <android-build-merger@google.com> 1469463267 +0000

Merge \"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a am: 616ba9d22b am: 39c3cf6914\" into nyc-mr1-dev-plus-aosp
am: 1d2cbecc84

Change-Id: Idafdce95c0f917400bc319daa5951162bcf11206