tree 0d5b86e47b0e392dd53df20076168792b95573a3
parent 7071758bd89f181edf5fbeb39d58e4d8eea955b1
parent 6329a0e2ae607a42024dab5bf6729a11ce4187b8
author Adam Vartanian <flooey@google.com> 1515616322 +0000
committer android-build-merger <android-build-merger@google.com> 1515616322 +0000

DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff am: bc161e0872  -s ours
am: 6329a0e2ae

Change-Id: Id9c6293718ad177e0c908df27a554c9f82f3b360