tree 632b38f2b518d003a5e92fb3fb59499da1b51a89
parent 68d7da1f34b3b7913d3e3ea9d713b71bbf565ebc
parent 33961ca66121b524e8fbb413648e508b83f6178b
author Chong Zhang <chz@google.com> 1543522814 -0800
committer android-build-merger <android-build-merger@google.com> 1543522814 -0800

Merge "Add .m4r to media scanner extensions" am: f3209f65de am: c969804cad
am: 33961ca661

Change-Id: I3e1a183097aa2a86c84b0c34f88c7db01f299679