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:
47e83a1
5e80aa1
)
am 5e80aa10: am d2d5a64a: workaround a deadlock when taking screenshots into a surface
author
Mathias Agopian
<mathias@google.com>
Tue, 12 Mar 2013 01:15:43 +0000
(
01:15
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 12 Mar 2013 01:15:43 +0000
(
01:15
+0000)
* commit '
5e80aa10d37dc066b2e079037a0564703be92ebb
':
workaround a deadlock when taking screenshots into a surface
Trivial merge