tree 146373b019a4908790b019644ebfdd0db18b0aff
parent 3f2c592c8d8cd00bd65bbe7131a86115d74e50ca
parent 181a10e36487b06ea54cf319872eb34ffb019915
author Adam Vartanian <flooey@google.com> 1515715655 +0000
committer android-build-merger <android-build-merger@google.com> 1515715655 +0000

DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours
am: 181a10e364  -s ours

Change-Id: I02d9a3e66d85372055c4f29a54fad3679cece053