tree a1fc7661a28ec1bcb88324a6a8f15b4bcff459d1
parent a220d6d27df5faa8000ac2bc9779ccda229f67a9
parent 1efb5151db674820841ee641c8df4fd9378695c0
author Adam Vartanian <flooey@google.com> 1515611569 +0000
committer android-build-merger <android-build-merger@google.com> 1515611569 +0000

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

Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e