tree c64b093d5bc7792a885b749ad4d88a8ec981ad21
parent 07cf971e58aecab76f2b5b575cfe62120005c6e4
parent 00f490844d89b146e5490204a5a483834950c489
author Scott Main <smain@google.com> 1360181970 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360181970 -0800

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

# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect