tree 10bc83307725e10ce5a4824d61bc400d373ad3cc
parent 16792f6fdaa9fddad64c3f91fec089c96f3e5519
parent fbfdc768b35d1a9b45f516e44f9c222f376b764c
author Android Build Merger (Role) <android-build-merger@google.com> 1469462479 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469462480 +0000

Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5 am: c0c9e529db" into nyc-mr1-dev-plus-aosp