tree 6b5eebb8d730724770759b68e0767d0c0618b1c7
parent 2204809646f429f688477c1654c78e1647a6b0d0
parent efb0258e08466e81eed8b6867ae3280b74d77667
author Adam Vartanian <flooey@google.com> 1515611882 +0000
committer android-build-merger <android-build-merger@google.com> 1515611882 +0000

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

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e