tree f51ab2224dac6fd980a461c51fef2e9c0ca10333
parent 045b505dc2d4f10ef618398e7ef690624b6157c2
parent d53f6430b0e81607c480b068bd44b6a28fc45adf
author Robert Ly <robertly@google.com> 1327103552 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327103552 -0800

am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1

* commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16