tree 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
parent 921d7f97f9500aabd80fe667b2a4b4fa5af2f297
parent ce8c8029db02b07777b5761bf737637a8d4b11b5
author Adam Vartanian <flooey@google.com> 1515802727 +0000
committer android-build-merger <android-build-merger@google.com> 1515802727 +0000

DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours
am: ce8c8029db

Change-Id: I9878eb189a75d1ec55464f434d4ed57b2330a7f1