tree e5f80f1c4246d14fb520cb677b261d5e47acc301
parent 05ce10c73919cad1a1f8531a9639ea1badbbf724
parent c1664576c11ed7f50a4a37fea0f79de97f718879
author Adam Vartanian <flooey@google.com> 1516142549 +0000
committer android-build-merger <android-build-merger@google.com> 1516142549 +0000

DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours am: 482d1b4a62  -s ours am: c0d866facc  -s ours am: 65a5896605
am: c1664576c1  -s ours

Change-Id: I9a2af1318f6eb62c386c3c806d4eab8f3c796e1d