Elliott Hughes 22ea4c41ae resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp ...

Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d

2014-10-04 09:38:07 -07:00

..

arrays.xml

Import translations. DO NOT MERGE

2014-09-20 23:28:12 -07:00

strings.xml

resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

2014-10-04 09:38:07 -07:00