tree 07016c4fa4e2d2794259b4395102543a07680f8b
parent e1b5358bae5a311f427767fcf4800c3f03ac6bc1
parent 265551de7210324d73c3985aa07ddfd8c79b94e7
author Jeff Sharkey <jsharkey@google.com> 1457560758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457560760 +0000

Merge "Resolve ringtone Uris using Context user." into nyc-dev