Merge commit 'android-fr/cupcake' into default cupcake master
authorAlex Ling <ling_kasim@yahoo.cn>
Thu, 4 Mar 2010 07:36:31 +0000 (15:36 +0800)
committerAlex Ling <ling_kasim@yahoo.cn>
Thu, 4 Mar 2010 07:36:31 +0000 (15:36 +0800)
commit5d52a711daf78524c726fe85384eaf0cf8691844
tree6dcb3e115aeb62824bff945c40cb31f65e4ac7d1
parent885db36a2b569d014082e044687f57c7982a7625
parent13241cfdf0f3d114498cb7a90f6fcaa87b563086
Merge commit 'android-fr/cupcake' into default

Conflicts:
default.xml
default.xml