commit | d88e0680edd88e10870d5f6f303633cea839d686 | [log] [tgz] |
---|---|---|
author | Romain Guy <romainguy@google.com> | Thu Aug 19 15:06:50 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 19 15:06:50 2010 -0700 |
tree | bde16bfa93dd2cf34abbd4603fa23b6385dc74f9 | |
parent | 36c051c717391afe12a1fe8163960286175f2f7e [diff] | |
parent | 288471d8a57e1c318742cbfc28697877436fdb87 [diff] |
am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw. Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp * commit '288471d8a57e1c318742cbfc28697877436fdb87': DO NOT MERGE. Load assets in place instead of deferring until draw.