OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 110dd46 8a5d527)
am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2
authorandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>
Thu, 29 Oct 2009 00:21:53 +0000 (17:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 00:21:53 +0000 (17:21 -0700)
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp

* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
  Bump version to 2.1 API 6.


Trivial merge
build
About OSDN
Find Software
Develop Software
Help