tree bff5841b034a3acabec56aa65e6d78661ea81256
parent 665fc3185d2bda1780ddc9074f46e11777e05405
parent cafad30176ad621f3d943cab942af2187bdec7dc
author Joe Fernandez <joefernandez@google.com> 1409156173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409156173 +0000

am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs

* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file