| commit | 6a1dba9317e3e4b3f3bd74bd1f8254e3ff0730ec | [log] [tgz] |
|---|---|---|
| author | Kevin Hufnagle <khufnagle@google.com> | Mon Jul 25 16:14:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 16:14:14 2016 +0000 |
| tree | cabe635322418634e7e2e668c8c919bc36103a6d | |
| parent | 920b47ae57b484add13178c68bdaf81095288575 [diff] | |
| parent | 349f20542a2a77638b91d4a42a5eb7157b1ab45b [diff] |
Merge \"Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\\" into nyc-dev am: aa57295104 am: ed0eb35760\" into nyc-mr1-dev-plus-aosp am: 349f20542a Change-Id: Id1071d6fb20f05831494a77e83ac1a197fc84228