Commit 23ee0ae
committed
Merge branch 'feat/continuous-profiling-part1' into feat/continuous-profiling-app-start-option
# Conflicts:
# sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java
# sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
# sentry/api/sentry.api
# sentry/src/main/java/io/sentry/ExperimentalOptions.java
# sentry/src/main/java/io/sentry/SentryAppStartProfilingOptions.java
# sentry/src/main/java/io/sentry/SentryOptions.java
# sentry/src/test/java/io/sentry/JsonSerializerTest.kt
# sentry/src/test/java/io/sentry/SentryOptionsTest.ktFile tree
0 file changed
+0
-0
lines changed0 file changed
+0
-0
lines changed
0 commit comments