OSDN Git Service

Merge branch 'froyo-x86' into gingerbread-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 22 May 2011 09:56:37 +0000 (17:56 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 22 May 2011 09:56:37 +0000 (17:56 +0800)
commitc9ef0a75b6980ced5f9aca5eb4bb07453ea05dfa
tree05b175bf968f5e6eec2f424acc1c3eac9c6f4f0f
parentfd25666c8a8381d7ad8c9cea79f39de1f63fb896
parent99453e79b6c853bfca5ead5e2519f7199c17f7ff
Merge branch 'froyo-x86' into gingerbread-x86

Conflicts:
eeepc_defconfig
AndroidBoard.mk
BoardConfig.mk