OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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.
author
Romain Guy
<romainguy@google.com>
Thu, 19 Aug 2010 22:06:50 +0000
(15:06 -0700)
committer
Android 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