Manually merge d877e0c4 from gingerbread-plus-aosp
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:52:51 +0000 (16:52 -0800)]
Change-Id: I2709295a0170928647159a9254e930eb04681fd1

1  2 
AndroidManifest.xml
res/values/strings.xml

Simple merge
Simple merge