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:
d00b898
ae80ffa
)
am 2bc48186: am 39e876ad: (-s ours) Merge "When filling the cache, we always time...
author
James Dong
<jdong@google.com>
Fri, 18 Jun 2010 01:47:22 +0000
(18:47 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 18 Jun 2010 01:47:22 +0000
(18:47 -0700)
Merge commit '
2bc481861ab374f87c12b7bb816ff75ac46147f1
' into gingerbread-plus-aosp
* commit '
2bc481861ab374f87c12b7bb816ff75ac46147f1
':
When filling the cache, we always time out waiting for a condition that won't occur.
Trivial merge