commit | ca1928cb3bd08d206aad5790454516e60062b315 | [log] [tgz] |
---|---|---|
author | Kevin Hufnagle <khufnagle@google.com> | Mon Jul 25 16:15:32 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 16:15:32 2016 +0000 |
tree | cabe635322418634e7e2e668c8c919bc36103a6d | |
parent | 2196de61ce473c1f02b2d1ecc3418d9a1956ea08 [diff] | |
parent | daccf00568bf6a8ff5d3d30bc9daa5ade69d62c4 [diff] |
Merge \"Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\\" into nyc-dev am: aa57295104 am: 00f04508da\" into nyc-mr1-dev-plus-aosp am: daccf00568 Change-Id: I38b5e21cb9f8667dd8b7ed6273f97219ef8a48b9