resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp
authorEric Fischer <enf@google.com>
Tue, 1 Feb 2011 02:49:26 +0000 (18:49 -0800)
committerEric Fischer <enf@google.com>
Tue, 1 Feb 2011 02:49:26 +0000 (18:49 -0800)
commitefe16febefe47888cfefde0215ea80ea3de498c0
treec7e2ed5ca02cac75bb068dc375b0990af8c66534
parente89f7ae578667815be08566d6dceeba130596680
parentfb20fb14ceaf94cadadbbc8aaebbbe050fba6abe
resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp

Change-Id: I6b80957186ce855000fd8292ca080ae47e37da49
res/values-es/strings.xml