tree d96c09aaacd9ff6ac5000e4426951e94b0627d29
parent 46a1b362dbbee0feaa395e6014b8c086ed54d7e0
parent 600d40a6a523557748103dc536458fdb35d2c52c
author Scott Main <smain@google.com> 1365786994 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365786994 -0700

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

* commit '600d40a6a523557748103dc536458fdb35d2c52c':
  add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81