tree c7a551ac41c107aa7a1f818f791a67f53ea01843
parent cef582ab0346afdaff9190565d432a9468ecdd7d
parent 805d2e2d98fa8749d6ae38650c77c79611174944
author Scott Main <smain@google.com> 1360182059 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360182059 -0800

am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev

# Via Android (Google) Code Review (1) and others
* commit '805d2e2d98fa8749d6ae38650c77c79611174944':
  docs: fix renderscript links that currently require redirect