| commit | d58c7edbc379a4d20b7877cb0e9626bbab1a5862 | [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 | bdc865dc1e9b18ce7b9d4fa672733499147cb01c | |
| parent | 7e84159f5f79835c6ae82bc6b4d8ef4bf131496f [diff] | |
| parent | d88e0680edd88e10870d5f6f303633cea839d686 [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.