OSDN Git Service

Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192
authorDongwon Kang <dwkang@google.com>
Fri, 1 Mar 2019 17:56:56 +0000 (09:56 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Mar 2019 17:56:56 +0000 (09:56 -0800)
commit4d0fb6f5dc06dabf3f99ebb59c6a376a7ee9b795
tree3665beeadad62b3f51660aa31a296795ac6c1118
parent436a76d1fa3b5dccdd708f5a3938c35251551940
parent524cbefb5c73bfe4ff9b91f557db6f21ae2d1b0f
Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192
am: 524cbefb5c

Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
core/java/android/net/Uri.java