Skip to content

Commit f0590aa

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 1690206 + 6437a14 commit f0590aa

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

fileViewer/src/main/res/layout/custom_audio_player_dialog_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
android:id="@+id/audioPlayer"
5858
android:layout_width="match_parent"
5959
android:layout_height="wrap_content"
60-
android:layout_marginBottom="10dp"
61-
android:layout_below="@id/topLayout" />
60+
android:layout_below="@id/topLayout"
61+
android:layout_marginBottom="10dp" />
6262

6363

6464
</RelativeLayout>

0 commit comments

Comments
 (0)