tree 6678dc9f5bb443088e8c2046cd627cef5bc101b2
parent 36407c961d8e6316615a71910b14093425e7be18
parent df249cbcbb6c35bd26db42ba7bc1ef756997e639
author Adam Vartanian <flooey@google.com> 1515612083 +0000
committer android-build-merger <android-build-merger@google.com> 1515612083 +0000

DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours
am: df249cbcbb  -s ours

Change-Id: I4a60d7a706e5753fe7402a6d27c67deaa5ca02ef