tree 0d5b86e47b0e392dd53df20076168792b95573a3
parent 5af7a7290f33a262e77b932e4904ff27f6062101
parent 9dcd9abb3e9fb959bf9d4269792b34d5f6e915c6
author Adam Vartanian <flooey@google.com> 1515615816 +0000
committer android-build-merger <android-build-merger@google.com> 1515615816 +0000

DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: bf44542d59 am: 9d37478448 am: f927fe1b92  -s ours
am: 9dcd9abb3e

Change-Id: I03e9ef4c6eabdb0466728358342a45b29f5eb313