| commit | c58fcad844d59f01dd6f5d9fc1c1803b075f1e10 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Sat Aug 21 09:44:12 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 21 09:44:12 2010 -0700 |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf | |
| parent | 646332a9a0ec7af75ef3e71ebb024472c609dd09 [diff] | |
| parent | 82fff40ab0522ab6e19d9e7a43764755d396d385 [diff] |
am d88e0680: (-s ours) am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw. Merge commit 'd88e0680edd88e10870d5f6f303633cea839d686' * commit 'd88e0680edd88e10870d5f6f303633cea839d686': DO NOT MERGE. Load assets in place instead of deferring until draw.