OSDN Git Service

resolved conflicts for merge of 33f86196 to stage-aosp-master
authorElliott Hughes <enh@google.com>
Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)
committerElliott Hughes <enh@google.com>
Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)
commit680c8c8e43804d9bf69568d4748b3bd3a4aea0ee
tree50a8fc4af2f9ff7b241b780914a8555614149da5
parentc5fc6231312b21efb601367bae28d63f9b26ac52
parent33f8619677393d3d15fcb25784985009af5d7bbd
resolved conflicts for merge of 33f86196 to stage-aosp-master

Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
50 files changed:
res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-be/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-et/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hi/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
res/values/strings.xml