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

Browse Source

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

...

This commit is contained in:

Robert Ly 2012-01-19 13:32:51 -08:00 committed by Android Git Automerger

parent 06449fbbb8 75a4189c2e

commit d53f6430b0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available