OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
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...
authorJames Dong <jdong@google.com>
Fri, 18 Jun 2010 01:47:22 +0000 (18:47 -0700)
committerAndroid 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
frameworks/native
About OSDN
Find Software
Develop Software
Help