tree 5259c3b1132041f0f6752cef6c8bf68158e15e15
parent eea4e8e803aeb2a0719f6614f02211a45dd7820c
parent 7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13
author Trevor Johns <trevorjohns@google.com> 1328303383 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328303383 -0800

am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1

* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.