Skip to content

Commit 039de8d

Browse files
yrezguiyrezgui
committed
Merge remote-tracking branch 'origin/yrezgui/storage-access-framework' into yrezgui/storage-access-framework
# Conflicts: # samples/storage/src/main/res/drawable/ic_audio_file_24.xml # samples/storage/src/main/res/drawable/ic_description_24.xml # samples/storage/src/main/res/drawable/ic_filter_alt_24.xml # samples/storage/src/main/res/drawable/ic_image_24.xml # samples/storage/src/main/res/drawable/ic_insert_drive_file_24.xml # samples/storage/src/main/res/drawable/ic_picture_as_pdf_24.xml # samples/storage/src/main/res/drawable/ic_video_file_24.xml
2 parents b08ee58 + 029ca94 commit 039de8d

0 file changed

File tree

    0 commit comments

    Comments
     (0)