tree 5ec2162cd8079c1b21ce979a3335fa260dc64672
parent d5b11c0adc01a051d559f2983938a9f79675e0be
parent 63d823e08c331411c484534d1c6b30ed6cac287a
author Ivan Chiang <chiangi@google.com> 1544454476 -0800
committer android-build-merger <android-build-merger@google.com> 1544454476 -0800

Merge "Add test for Uri.toSafeString" am: 5a6e995881
am: 63d823e08c

Change-Id: Ie3cf50686b232db643cfbb50c2a82f712c54af30