tree 4dc73dbab6acb2851f5ad24beb73edb13278a932
parent 8b3cecef9a9fba7bcda166a4b4cd87a8d593a9ba
parent a86e840b9987a3c03f66a9f582cbe11361847118
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516139512 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516139512 +0000

[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours am: 694da5a82b am: a86e840b99

Change-Id: I0e9b6675d1781fa7cf2d1d7075f2949855a5b7ae