replicant-packages_apps_Email/res
Paul Westbrook 724c98b021 fix bad merge
Change-Id: I6d26de849761bfa31e521e7836ec6358907bbbf9
2014-11-02 12:34:33 -08:00
..
color Restyle account setup flow nav buttons 2014-10-09 10:38:47 -07:00
drawable Restyle account setup flow nav buttons 2014-10-09 10:38:47 -07:00
drawable-hdpi Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
drawable-mdpi Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
drawable-nodpi Remove unused resource 2014-09-07 11:57:29 -07:00
drawable-v21 Account authentication restyling 2014-10-08 15:49:03 -07:00
drawable-xhdpi Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
drawable-xxhdpi Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
layout Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
layout-w600dp Account authentication restyling 2014-10-08 15:49:03 -07:00
layout-w800dp Move the setup nav buttons to the bottom on tablets 2014-04-23 10:34:16 -07:00
menu
mipmap-hdpi Move Email Icons (Email) 2014-10-02 10:38:21 -07:00
mipmap-mdpi Move Email Icons (Email) 2014-10-02 10:38:21 -07:00
mipmap-xhdpi Move Email Icons (Email) 2014-10-02 10:38:21 -07:00
mipmap-xxhdpi Move Email Icons (Email) 2014-10-02 10:38:21 -07:00
mipmap-xxxhdpi Move Email Icons (Email) 2014-10-02 10:38:21 -07:00
values Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev 2014-10-10 15:30:39 +00:00
values-af resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-am resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-ar resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-bg resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-ca resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-cs resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-da resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-de resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-el resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-en-rGB resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-en-rIN resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-es resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-es-rUS resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-et-rEE resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-fa resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-fi resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-fr resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-fr-rCA resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-hr Import translations. DO NOT MERGE 2014-10-13 12:17:24 -07:00
values-hu resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-hy-rAM resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-in resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-it resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-iw resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-ja resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-ka-rGE resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-km-rKH fix bad merge 2014-11-02 12:34:33 -08:00
values-ko resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-ldrtl Fix a a problem in some button padding 2014-04-23 17:54:18 -07:00
values-lo-rLA fix bad merge 2014-11-02 12:34:33 -08:00
values-lt resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-lv resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-mn-rMN resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-ms-rMY resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-nb resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-nl resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-pl resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-pt resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-pt-rPT resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-rm Remove unused resources 2014-09-10 03:24:53 -07:00
values-ro resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-ru resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-sk resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-sl resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-sr resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-sv resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-sw resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-th resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-tl resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-tr resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-uk resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp 2014-11-02 11:10:17 -08:00
values-v21 minor: remove comment that primaryColor is used for ActionBar 2014-09-29 18:50:18 +02:00
values-vi resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-w600dp Restyle account setup flow nav buttons 2014-10-09 10:38:47 -07:00
values-zh-rCN resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-zh-rHK resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-zh-rTW resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
values-zu resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp 2014-11-02 10:49:50 -08:00
xml Provider configuration for outlook, yahoo, gmx 2014-10-17 14:23:44 +02:00
xml-sw600dp Remove unused resource 2014-09-07 11:57:29 -07:00