OSDN Git Service

Merge remote-tracking branch 'korg/froyo-release' into froyo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000 (17:29 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000 (17:29 +0800)
commit4fce614c5c2e3cffa0e52635eba7d018a156a94e
tree3a6b225ba4cbf3c1b4e606fdaf0734a8078dd566
parentaf82f810a55ac830fa8608ceaa676269994999e7
parent7b7a397bccdd266233a114e6e12bf1f1071657e9
Merge remote-tracking branch 'korg/froyo-release' into froyo-x86

Conflicts:
core/version_defaults.mk