tree f053791b2ab65c58895d16b53dad660248e0a11b
parent 4ccdfd28cf037b4714902c1f5f68aafa7ce4ea1b
parent a02bbf31c4a0d41eebaccbdd37bf9c48c7c82fc9
author Adam Vartanian <flooey@google.com> 1515711269 +0000
committer android-build-merger <android-build-merger@google.com> 1515711269 +0000

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

Change-Id: Ie6deaf23a60a51cae1fc5441006649134640e44b