OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78e502d
79447b2
)
am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
author
Jack Palevich
<jackpal@google.com>
Fri, 6 Nov 2009 08:25:44 +0000
(
00:25
-0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 6 Nov 2009 08:25:44 +0000
(
00:25
-0800)
Merge commit '
79447b2087c8c820d742185dda7305101f9656f0
' into eclair-mr2-plus-aosp
* commit '
79447b2087c8c820d742185dda7305101f9656f0
':
Improve GLSurfaceView to avoid deadlocks and race conditions.
Trivial merge