tree ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
parent c0a1334c94146b26929efc439036e816d7646ec1
parent d1d09b39d913feee61ad5f1c99858a838a9b6d80
author Adam Vartanian <flooey@google.com> 1515617085 +0000
committer android-build-merger <android-build-merger@google.com> 1515617085 +0000

DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9  -s ours am: abd196715f am: d18aefffcf
am: d1d09b39d9

Change-Id: I4f0e6b89262f102756919467ec47786146ddbd7b