Manually merge d877e0c4 from gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Sat, 20 Nov 2010 00:52:51 +0000 (16:52 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 20 Nov 2010 00:52:51 +0000 (16:52 -0800)
commit2ef520bbcc63471c401bf02af75404fd83481f37
treeae96f964353e889005ca21952470687f2a8b4829
parente4438048b7928cf44dda3c825c242490d50bab8a
parentd877e0c443fc4ceb4fdd441dde5778978638e7ee
Manually merge d877e0c4 from gingerbread-plus-aosp

Change-Id: I2709295a0170928647159a9254e930eb04681fd1
AndroidManifest.xml
res/values/strings.xml