Merge pull request MicrosoftDocs#3125 from MicrosoftDocs/FromPublicMasterBranch

PRMerger6 · web-flow · commit 7b6f99ac4e66 · 2020-09-08T13:02:49.000-07:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/cppcx/wrl/callback-function-wrl.md b/docs/cppcx/wrl/callback-function-wrl.md
@@ -17,7 +17,7 @@ template<
    typename TCallback
 >
 ComPtr<TDelegateInterface> Callback(
-   TCallbackcallback
+   TCallback callback
 );
 template<
    typename TDelegateInterface,
diff --git a/docs/cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md b/docs/cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md
@@ -46,6 +46,9 @@ The Visual Studio Installer includes a **Mobile development with C++** workload.
 
 - Android Native Development Kit (NDK), Apache Ant, and the C++ Android development tools are required to build C++ code that targets the Android platform.
 
+  > [!NOTE]
+  > Some tools in the Android NDK don't support Unicode characters in file paths and file names. If a project or source file has Unicode characters in its path or file name, the project will fail to build.
+
 - The Google Android Emulator and Intel Hardware Accelerated Execution Manager (HAXM) are optional, but recommended, components. (The Intel HAXM drivers only work on Intel processors, and are incompatible with some VMs, including Hyper-V.) You can develop and debug directly on an Android device, but it's often easier to use an emulator on your desktop for debugging.
 
 - C++ iOS development tools are required to build C++ code that targets the iOS platform.

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ template<`
`17`	`17`	`typename TCallback`
`18`	`18`	`>`
`19`	`19`	`ComPtr<TDelegateInterface> Callback(`
`20`		`- TCallbackcallback`
	`20`	`+ TCallback callback`
`21`	`21`	`);`
`22`	`22`	`template<`
`23`	`23`	`typename TDelegateInterface,`