| commit | cdc1ea03130763963fe6c179ed1f5ec14d6c7750 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Thu Jan 19 13:32:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 19 13:32:51 2012 -0800 |
| tree | 058f3d42a1881b19b518f70f50fc26ef2ae37eba | |
| parent | 5d0c713a87e9fd3cc7a775092aef9fc1194c7440 [diff] | |
| parent | 4e552533ea049970b54c1cdba5afb7d13496c3c1 [diff] |
am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 * commit '4e552533ea049970b54c1cdba5afb7d13496c3c1': cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16