OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65634c6 8c02312)
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)
Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp

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


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help