tree 85b277a75b9e7e188265b33fcc7881c30bd37230
parent aeabb60d469ae8f60ca330c8f5fcc01e64b8aa37
parent 663f1448c32f6e586813730d00cd0174998b8052
author TreeHugger Robot <treehugger-gerrit@google.com> 1588088107 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1588088107 +0000

Merge "Allow ModernMediaScanner to set MEDIA_TYPE" into rvc-dev