tree b64a77eba9658c782f258e9b28cc11ef423fc769
parent 3b38b58b1f73128346be7d5459cf7f0fd77cc067
parent 50ec90be8d072e093caed22dd0c5a6100996d10e
author Adam Vartanian <flooey@google.com> 1515711382 +0000
committer android-build-merger <android-build-merger@google.com> 1515711382 +0000

DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours
am: 50ec90be8d  -s ours

Change-Id: Ifcf62d3d2b4e46734419677980da68bcaf9c6f45