Commit fa37f9e0 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 2d6c0d64: am 332b9382: Merge "CtsTestServer: Add support for an alternate... 

am 2d6c0d64: am 332b9382: Merge "CtsTestServer: Add support for an alternate redirect route" into klp-dev

* commit '2d6c0d64':
  CtsTestServer: Add support for an alternate redirect route
parents 70f3ae69 2d6c0d64
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment