commit | c4146fc032cfe3e95b188156b9ea1edd93858a89 | [log] [tgz] |
---|---|---|
author | Kevin Hufnagle <khufnagle@google.com> | Mon Jul 25 16:14:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 16:14:47 2016 +0000 |
tree | cabe635322418634e7e2e668c8c919bc36103a6d | |
parent | 68fca58de866316f244d30ba9cb871be7d594825 [diff] | |
parent | 44277c919a8691264cdc95dd5d157baa2e31d544 [diff] |
Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: 83cd591aa2\" into nyc-mr1-dev-plus-aosp am: 44277c919a Change-Id: I502a165c329f2af7634428cbcd5cf6a8b55d5b4c