tree 06652c6bce4297e3aef8fa6f80cfc7afada74c77
parent 4f4d243d699d37310a914606fb4e5fc09ba9fc00
parent 4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc
author Scott Main <smain@google.com> 1365786695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365786695 -0700

am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs

* commit '4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc':
  add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81