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