tree 8eb76d4b684640d127eefabc4216a17a6adbde81
parent 017cac1442477d3e6797b42a3fe27e18008a5497
parent 18e31143179feeaaf6d69b27259444374f7591d6
author Adam Vartanian <flooey@google.com> 1515716194 +0000
committer android-build-merger <android-build-merger@google.com> 1515716194 +0000

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

Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d