tree 0d5b86e47b0e392dd53df20076168792b95573a3
parent 63721f94a010f8f9e9070da7fe38d4f8b2cb3e60
parent ec320be2b34f37de99875d33c4e4bd9f81009a91
author Adam Vartanian <flooey@google.com> 1515614269 +0000
committer android-build-merger <android-build-merger@google.com> 1515614269 +0000

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

Change-Id: I372e3e106968586e4dc2592cc5bf872be31960e7