| commit | 96d58cf758c83f426f52259696ead4d6d9358072 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Fri Jan 20 15:52:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 20 15:52:32 2012 -0800 |
| tree | e50430069929a4b1e65de37fddfbcc143ccfcc47 | |
| parent | 9ace027a27f98380f69920d8ede4a6a70eff5946 [diff] | |
| parent | cdc1ea03130763963fe6c179ed1f5ec14d6c7750 [diff] |
am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 * commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750': cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16