Elliott Hughes 680c8c8e43 resolved conflicts for merge of 33f86196 to stage-aosp-master ...

Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8

2012-09-06 16:09:04 -07:00

..

arrays.xml

Import translations. DO NOT MERGE

2012-05-25 14:48:17 -07:00

strings.xml

resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:09:04 -07:00