Merge branch 'develop' into gutenberg/add/reusable-block-capability

# Conflicts: # build.gradle
wordpress-mobile · fluiddot · May 26, 2021 · May 11, 2021 · May 12, 2021 · May 12, 2021
commit 2276488ff6da6598c6f0cb910a39ec88f4eac13f
diff --git a/libs/stories-android b/libs/stories-android
+36 −37		README.md
+0 −1		mp4compose/src/main/java/com/daasuu/mp4compose/Rotation.kt
+0 −22		mp4compose/src/main/java/com/daasuu/mp4compose/VideoFormatMimeType.java
+0 −209		mp4compose/src/main/java/com/daasuu/mp4compose/composer/AudioChannelWithSP.java
+5 −21		mp4compose/src/main/java/com/daasuu/mp4compose/composer/AudioComposer.kt
+0 −75		mp4compose/src/main/java/com/daasuu/mp4compose/composer/BaseAudioChannel.java
+0 −68		mp4compose/src/main/java/com/daasuu/mp4compose/composer/ComposerProvider.kt
+0 −24		mp4compose/src/main/java/com/daasuu/mp4compose/composer/Listener.kt
+28 −7		mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4Composer.kt
+0 −453		mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerBasic.java
+0 −424		mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngineBasic.java
+1 −1		mp4compose/src/main/java/com/daasuu/mp4compose/composer/RemixAudioComposer.kt
+0 −235		mp4compose/src/main/java/com/daasuu/mp4compose/composer/RemixAudioComposerBasic.java
+0 −975		mp4compose/src/main/java/com/daasuu/mp4compose/composer/SonicAudioProcessor.java
+0 −3		mp4compose/src/main/java/com/daasuu/mp4compose/composer/VideoComposer.kt
+0 −23		mp4compose/src/main/java/com/daasuu/mp4compose/logger/AndroidLogger.java
+0 −32		mp4compose/src/main/java/com/daasuu/mp4compose/logger/Logger.java
+0 −14		mp4compose/src/main/java/com/daasuu/mp4compose/source/DataSource.java
+0 −43		mp4compose/src/main/java/com/daasuu/mp4compose/source/FilePathDataSource.java
+10 −29		photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt