OSDN Git Service

Merge remote-tracking branch 'korg/froyo' into froyo-x86 froyo-x86 android-x86-2.2-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Apr 2011 09:14:09 +0000 (17:14 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Apr 2011 09:14:09 +0000 (17:14 +0800)
1  2 
res/values/strings.xml

Simple merge