tree 9ed912d43aa396e46f263ee68d09e34db822bf76
parent e6b466554c8616b32cdbc06f8580890a57bcb233
parent 98ea7dad3e195e3b75e45332e2e36174a944c063
author Marco Nelissen <marcone@google.com> 1392918160 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392918160 +0000

am 98ea7dad: Merge "CtsTestServer: Add support for an alternate redirect route"

* commit '98ea7dad3e195e3b75e45332e2e36174a944c063':
  CtsTestServer: Add support for an alternate redirect route