tree 7783484dcb4c3c11f9203001f0dcda13d72bed12
parent 3b5966b0698fd982675d5169ee641d7b214f596d
parent c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9
author Robert Ly <robertly@google.com> 1334096017 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334096017 -0700

am c4bbc7b4: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit 'c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9':