tree 6678dc9f5bb443088e8c2046cd627cef5bc101b2
parent b7a503b5784b520da5ae6ca124426744f8b4f12c
parent eb7c20df71e1adc09d34798802a9eef8723f70ed
author Adam Vartanian <flooey@google.com> 1515613145 +0000
committer android-build-merger <android-build-merger@google.com> 1515613145 +0000

DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: 7ae5d30389
am: eb7c20df71

Change-Id: I0be9450ac48356351c11e532db821a8b0ef12fad