Commits
Robert Ly authored and Android Git Automerger committed 96d58cf758cM
am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 * commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750': cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
Showing diff tocdc1ea03130