OSDN Git Service

(root) / android-x86 / sdk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a13d15f a307a44)
am 0d439910: am 302e013b: am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
authorXavier Ducrohet <xav@android.com>
Mon, 19 Oct 2009 21:58:36 +0000 (14:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2009 21:58:36 +0000 (14:58 -0700)
Merge commit '0d43991074e178c388b06b2f8984967c140451b9' into eclair-mr2-plus-aosp

* commit '0d43991074e178c388b06b2f8984967c140451b9':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.


Trivial merge
sdk
About OSDN
Find Software
Develop Software
Help