OSDN Git Service

am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.
authorRomain Guy <romainguy@google.com>
Thu, 19 Aug 2010 22:06:50 +0000 (15:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Aug 2010 22:06:50 +0000 (15:06 -0700)
commit82fff40ab0522ab6e19d9e7a43764755d396d385
tree849c2bad6cc17de4aabbf3d7c77473978f489cc3
parent65634c63450a3328b5dc9d4c6333f25a1d142273
parent8c02312a82908ddbd0425d610ad3cbdb5930e47c
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.