am d88e0680: (-s ours) am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.

Browse Source

Merge commit 'd88e0680edd88e10870d5f6f303633cea839d686'

* commit 'd88e0680edd88e10870d5f6f303633cea839d686':
  DO NOT MERGE. Load assets in place instead of deferring until draw.

...

This commit is contained in:

Romain Guy

2010-08-21 09:44:12 -07:00

committed by Android Git Automerger

parent 7e84159f5f d88e0680ed

commit d58c7edbc3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available