From 257f848c60230dd21f6742a5306792d1208b4034 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 30 Apr 2020 11:08:09 -0400
Subject: [PATCH 1/2] Bump to xamarin/xamarin-android-tools/master@f5fcb9fd

Changes: https://github.com/xamarin/xamarin-android-tools/compare/12f52acd4407323b2e1b48ca56bab80ffd97b31e...f5fcb9fd1583ebe928734e8525303a0dbe93c79c

  * xamarin/xamarin-android-tools@f5fcb9f: [Xamarin.Android.Tools.AndroidSdk] Add support for cmdline-tools (#83)
  * xamarin/xamarin-android-tools@f473ff9: [AndroidSdkWindows] Guard against exception checking registry (#79)
  * xamarin/xamarin-android-tools@36d7fee: JetBrains OpenJDK 11 detection (#82)
---
 external/xamarin-android-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 12f52acd440..f5fcb9fd158 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 12f52acd4407323b2e1b48ca56bab80ffd97b31e
+Subproject commit f5fcb9fd1583ebe928734e8525303a0dbe93c79c

From 560e8379ff40c17c87296796246b669b79ccfdb1 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 30 Apr 2020 14:48:53 -0400
Subject: [PATCH 2/2] Add release notes

---
 Documentation/release-notes/4640.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Documentation/release-notes/4640.md

diff --git a/Documentation/release-notes/4640.md b/Documentation/release-notes/4640.md
new file mode 100644
index 00000000000..8148530dbb6
--- /dev/null
+++ b/Documentation/release-notes/4640.md
@@ -0,0 +1,5 @@
+#### Application and library build and deployment
+
+  * [GitHub PR 79](https://github.com/xamarin/xamarin-android-tools/commit/f473ff9):
+    May address an `ArgumentException` observed on Windows machine when the
+    Registry contains an invalid path to the Android SDK.