OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cc2440 b595228)
resolved conflicts for merge of b5952289 to master
authorThe Android Automerger <android-build@android.com>
Mon, 24 Jan 2011 07:34:23 +0000 (23:34 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 24 Jan 2011 07:34:23 +0000 (23:34 -0800)
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f

1  2 
core/version_defaults.mk patch | diff1 | diff2 | blob | history

diff --cc core/version_defaults.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help