From 758f1f0d5bf148809ce1c39fadb55363bfe2a38b Mon Sep 17 00:00:00 2001
From: Ubuntu <lee.maguire@mongodb.com>
Date: Tue, 23 Apr 2024 21:14:49 +0000
Subject: [PATCH 1/3] Add changelog entry

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 785a504041d..6d1460c8e95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,14 @@
 
 ### Enhancements
 * <New feature description> (PR [#????](https://github.com/realm/realm-core/pull/????))
+<<<<<<< HEAD
 * None.
+=======
+* Add `SyncClientConfig::security_access_group` which allows specifying the access group to use for the sync metadata Realm's encryption key. Setting this is required when sharing the metadata Realm between apps on Apple platforms ([#7552](https://github.com/realm/realm-core/pull/7552)).
+* When connecting to multiple server apps, a unique encryption key is used for each of the metadata Realms rather than sharing one between them ([#7552](https://github.com/realm/realm-core/pull/7552)).
+* Introduce the new `SyncUser` interface which can be implemented by SDKs to use sync without the core App Services implementation (or just for greater control over user behavior in tests). ([PR #7300](https://github.com/realm/realm-core/pull/7300).
+* Add vendor support to the Android Blueprint.
+>>>>>>> 2919314b6 (Add changelog entry)
 
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)

From 5482e6e465aa700cc2e491b5bdb4a2ea39b87c2b Mon Sep 17 00:00:00 2001
From: Ubuntu <lee.maguire@mongodb.com>
Date: Mon, 27 May 2024 15:53:19 +0000
Subject: [PATCH 2/3] Add missing bid file to android bp

fix merge
---
 Android.bp   | 1 +
 CHANGELOG.md | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index 1d667c340c5..fea7da0c0b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,6 +75,7 @@ cc_object {
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid128_string.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid128_2_str_tables.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid64_to_bid128.c",
+        "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid32_to_bid128.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid128_to_int64.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid128_quantize.c",
         "src/external/IntelRDFPMathLib20U2/LIBRARY/src/bid_convert_data.c",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d1460c8e95..785a504041d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,7 @@
 
 ### Enhancements
 * <New feature description> (PR [#????](https://github.com/realm/realm-core/pull/????))
-<<<<<<< HEAD
 * None.
-=======
-* Add `SyncClientConfig::security_access_group` which allows specifying the access group to use for the sync metadata Realm's encryption key. Setting this is required when sharing the metadata Realm between apps on Apple platforms ([#7552](https://github.com/realm/realm-core/pull/7552)).
-* When connecting to multiple server apps, a unique encryption key is used for each of the metadata Realms rather than sharing one between them ([#7552](https://github.com/realm/realm-core/pull/7552)).
-* Introduce the new `SyncUser` interface which can be implemented by SDKs to use sync without the core App Services implementation (or just for greater control over user behavior in tests). ([PR #7300](https://github.com/realm/realm-core/pull/7300).
-* Add vendor support to the Android Blueprint.
->>>>>>> 2919314b6 (Add changelog entry)
 
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)

From 50f34964d45ddb4ed3d7b92b44c7864337b16607 Mon Sep 17 00:00:00 2001
From: Ubuntu <lee.maguire@mongodb.com>
Date: Mon, 27 May 2024 16:03:25 +0000
Subject: [PATCH 3/3] Add changelog entry

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 785a504041d..6bf23339e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,10 @@
 
 ### Enhancements
 * <New feature description> (PR [#????](https://github.com/realm/realm-core/pull/????))
-* None.
 
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
-* None.
+* Add a missing file from the bid library to the android blueprint. (PR [#7738](https://github.com/realm/realm-core/pull/7738))
 
 ### Breaking changes
 * None.