tree 8279758a4550cfce624f11d4ff6d530872c9d758
parent e477541e10128595d87f528a2982423a2dc77cd2
parent 6b4982ab840c0ed7e863fc08949076d93b7e15d3
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516159383 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516159383 +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: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84

Change-Id: I5ad7437c1666b13a838686bd79e066671f14d7ed