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

* commit '87f81a89f4b1912715aef02e70bc0af10b34909b':