summaryrefslogtreecommitdiffstats
path: root/res/values-da
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2014-11-02 21:10:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-02 21:10:38 +0000
commit5a22261ac379cdbfa77916c5660a327de6347419 (patch)
treeba9526c064591e0ef7d02ce02a7ffcc1ee09f191 /res/values-da
parentcd36d76601b8a5713795131a7a7a98e666ad7402 (diff)
parentf27710dd69d93ca89fcdd58c6de876ef0c59b81d (diff)
downloadandroid_packages_apps_Email-5a22261ac379cdbfa77916c5660a327de6347419.tar.gz
android_packages_apps_Email-5a22261ac379cdbfa77916c5660a327de6347419.tar.bz2
android_packages_apps_Email-5a22261ac379cdbfa77916c5660a327de6347419.zip
am f27710dd: am aeaa7616: am 19c35f5f: am 1c0662f9: fix bad merge
* commit 'f27710dd69d93ca89fcdd58c6de876ef0c59b81d': fix bad merge
Diffstat (limited to 'res/values-da')
0 files changed, 0 insertions, 0 deletions