tree 6c10601abb71570cefd2e6812e6e78e4e5f57515
parent 80151b37659229a2d5b92e93c4ea4f89530e2054
parent 3788ac124b9daeefb611b2aa7c42840489f807e1
author Ivan Chiang <chiangi@google.com> 1600404060 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600404060 +0000

Merge "Revert "Ringtone uri should add type query"" am: 56da278127 am: 7a5e865a80 am: b145311a8d am: 3bff601a8a am: 3788ac124b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968

Change-Id: If5f2440d3c7621bc9ce9260e5f7d0ad3b5d71d65