Commit Graph

132 Commits

Author SHA1 Message Date
Michael Bestas
89e216df34 Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Email into cm-13.0"
This reverts commit 97bb12ecc4, reversing
changes made to 457778a056.

Change-Id: If9444c1b4824e94f2cfe7074e87e98a5d46f0c6b
2016-05-01 23:28:43 +03:00
Steve Kondik
97bb12ecc4 Android 6.0.1 release 22
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlbd4ToACgkQ6K0/gZqxDng9EACgi+ju6KA5Fiexz7+LYHPmXvsx
 BmMAmwfY8Q3sLnQNjOZI4BmTUHjEG8B3
 =3bnz
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Email into cm-13.0

Android 6.0.1 release 22
2016-03-10 18:22:59 -08:00
Michael Bestas
457778a056 Automatic translation import
Change-Id: I8f12eab6eb3d524a8967ad1bb0a4d048bd100bc8
2016-03-05 00:17:33 +02:00
Tom Powell
47301c4d54 Automatic translation import
Change-Id: I3788414aaa622ea6a9fb1bdd496314ba2ccfb4e7
2015-10-18 14:06:01 -07:00
Michael Bestas
fff063d6d9 Automatic translation import
Change-Id: I47a88655494be6161c944d96532534d1c2ac1ad2
2015-10-18 14:05:32 -07:00
Geoff Mendal
dcb985eafe Import translations. DO NOT MERGE
Change-Id: I6e64b3ae53a67cfe71245617c64d3cc2116c360f
Auto-generated-cl: translation import
2015-07-15 09:39:49 -07:00
Geoff Mendal
7e7e4e20d0 Import translations. DO NOT MERGE
Change-Id: I5f570dc10d4d12cb73abb9e9e04daf3e9addafd6
Auto-generated-cl: translation import
2014-11-10 06:06:16 -08:00
Geoff Mendal
1e86f7978a Import translations. DO NOT MERGE
Change-Id: I4793d0f9baccd8d3dc96713562d3cc2ddd983283
Auto-generated-cl: translation import
2014-11-03 12:56:07 -08:00
Paul Westbrook
a54d0838b7 resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
2014-11-02 11:00:40 -08:00
Paul Westbrook
6666fbf090 resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
2014-11-02 10:49:50 -08:00
Paul Westbrook
3262a8d807 am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev
* commit 'f866891f92dd01df6694302490212ccf4f8f4b31':
  Remove unused resources
2014-11-02 15:32:24 +00:00
Paul Westbrook
8f0f19c414 Remove unused resources
Also remove broken & disabled tests that referenced otherwise
unused resources

Change resource names to prevent duplicate resources.

Bug: 17414014
Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b
2014-09-10 03:24:53 -07:00
Baligh Uddin
efb6cb2523 Import translations. DO NOT MERGE
Change-Id: Ica2b0b6d4089ea625b523752a758d120981d4d95
Auto-generated-cl: translation import
2014-08-31 11:20:27 -07:00
Baligh Uddin
ee727d398a Import translations. DO NOT MERGE
Change-Id: Ie226833c566b4633e7690d53ae6f86399f7b298d
Auto-generated-cl: translation import
2014-08-26 09:17:04 -07:00
Baligh Uddin
fbbba84302 Import translations. DO NOT MERGE
Change-Id: Ic2c6080e9372b706f00f60742ba55fe2f8832da8
Auto-generated-cl: translation import
2014-08-24 08:54:25 -07:00
Baligh Uddin
6d165bca6b Import translations. DO NOT MERGE
Change-Id: Ice21d328d3d7e6364ec40a6d3b84b8b03ae6b81b
Auto-generated-cl: translation import
2014-08-14 22:19:23 -07:00
Baligh Uddin
ea99a05733 Import translations. DO NOT MERGE
Change-Id: I8449b7fd0a2636b78453332a99452ac688daf15b
Auto-generated-cl: translation import
2014-08-14 20:28:06 -07:00
Baligh Uddin
a780beb0f8 Import translations. DO NOT MERGE
Change-Id: I860f4cdce83a78886cf33358d31118f5dafa9c89
Auto-generated-cl: translation import
2014-08-11 11:27:53 -07:00
Geoff Mendal
033d40ed37 Import translations. DO NOT MERGE
Change-Id: Ie21859c638fe7eee6fdb1f3856d4d71b456386af
Auto-generated-cl: translation import
2014-08-04 08:03:13 -07:00
Geoff Mendal
7063124d1d Import translations. DO NOT MERGE
Change-Id: I71c2cbaec779d2aa773ba61ece2a303de448e9f8
Auto-generated-cl: translation import
2014-07-30 09:09:33 -07:00
Baligh Uddin
28dacfbbf4 Import translations. DO NOT MERGE
Change-Id: I05c450ccc246284ebd339788a4856f9fa8b12511
Auto-generated-cl: translation import
2014-07-21 08:40:46 -07:00
Baligh Uddin
92a5b634ab Import translations. DO NOT MERGE
Change-Id: I100693f4f816c7cc078d6cbbd8c01a2c074b2380
Auto-generated-cl: translation import
2014-07-06 11:17:13 -07:00
Baligh Uddin
7dfa1c6dcf Import translations. DO NOT MERGE
Change-Id: I439dbd842735d5ef2e118b863ccd32114312fbc2
Auto-generated-cl: translation import
2014-06-02 14:33:17 -07:00
Baligh Uddin
9333181a13 Import translations. DO NOT MERGE
Change-Id: Ifd9c6352f3b9a74c6e922cb1b4c87ae71dd01fbb
Auto-generated-cl: translation import
2014-04-30 13:55:00 -07:00
Baligh Uddin
07e5d791e8 Import translations. DO NOT MERGE
Change-Id: I4c7f2d5f6667d749260bcd5c17e6f8cbeb771c32
Auto-generated-cl: translation import
2014-04-28 13:32:00 -07:00
Baligh Uddin
970ff11689 Import translations. DO NOT MERGE
Change-Id: I2e1aea8e6e9ae1ecee943ce1f0104d8f1260c52d
Auto-generated-cl: translation import
2014-04-23 15:30:45 -07:00
Baligh Uddin
be90af0070 Import translations. DO NOT MERGE
Change-Id: I855e8fc6bb15c4b40ffd2fccae5e43b7a850455e
Auto-generated-cl: translation import
2014-04-09 13:47:35 -07:00
Baligh Uddin
fb334eb5cb Import translations. DO NOT MERGE
Change-Id: I8db8bde4cc35a52217b23212ef5f55c94a3278e7
Auto-generated-cl: translation import
2014-04-07 13:13:33 -07:00
Baligh Uddin
44e81bd28b Import translations. DO NOT MERGE
Change-Id: I63887c7aa9f637d097a27832c6940b65fd6fed53
Auto-generated-cl: translation import
2014-04-01 12:55:26 -07:00
Scott Kennedy
deb231df7d Remove all translations for a fresh import
Change-Id: I7ead59a4aedabd68b66a4012c45e964f03884a7e
2014-03-31 11:03:30 -07:00
Baligh Uddin
30816bcb5a Import translations. DO NOT MERGE
Change-Id: I008a12776cdc42ec8e0e36d0d5666b030e599db7
Auto-generated-cl: translation import
2014-03-24 14:08:32 -07:00
Geoff Mendal
37798753ab Import translations. DO NOT MERGE
Change-Id: Ic697d490d6df29f25a3deb4ec34c4da33e3b1154
Auto-generated-cl: translation import
2014-03-17 13:43:58 -07:00
Baligh Uddin
d5567bbc04 Import translations. DO NOT MERGE
Change-Id: Ib4a1f8cb08ba7da4a1ecf2dbe99f13ae6e9628fc
Auto-generated-cl: translation import
2014-03-03 13:31:58 -08:00
Baligh Uddin
e41461c151 Import translations. DO NOT MERGE
Change-Id: I814417b33835cb75d196077b56c073514235a9c4
Auto-generated-cl: translation import
2014-02-26 13:11:12 -08:00
Baligh Uddin
cad590c9a4 Import translations. DO NOT MERGE
Change-Id: I10e59f47be32dbf3ff8d301c03751f6ef5d355e8
Auto-generated-cl: translation import
2014-02-20 11:23:04 -08:00
Baligh Uddin
872ac905b1 Import translations. DO NOT MERGE
Change-Id: Ia37ab9c4383edec2fe3d54d070fc496d1c1476e4
Auto-generated-cl: translation import
2014-02-17 16:36:07 -08:00
Baligh Uddin
35191b4317 Import translations. DO NOT MERGE
Change-Id: Ia5024a299db2bacbe50db76c030a3734bb34dc4c
Auto-generated-cl: translation import
2014-02-10 15:59:38 -08:00
Geoff Mendal
1cd602d008 Import translations. DO NOT MERGE
Change-Id: I6589b510ad8a782ddf90fffd7a578849b994852b
Auto-generated-cl: translation import
2014-02-05 14:47:04 -08:00
Geoff Mendal
d7f3cebe50 Import translations. DO NOT MERGE
Change-Id: I609e2347a2ea9ce574cc3d0d4f318d3bb2cdf5ca
Auto-generated-cl: translation import
2014-02-03 17:17:16 -08:00
Baligh Uddin
0556b8ef07 Import translations. DO NOT MERGE
Change-Id: Iedd01c9798dc2af725f1244d594b45dd020e3143
Auto-generated-cl: translation import
2013-11-11 11:37:40 -08:00
Baligh Uddin
50685ecafe Import translations. DO NOT MERGE
Change-Id: I5a1bc6f69f1adadb1c75031c400b5551c087fef7
Auto-generated-cl: translation import
2013-11-06 15:37:47 -08:00
Baligh Uddin
0aa577ccba Import translations. DO NOT MERGE
Change-Id: I4d413243206349a807d106b824f0a5021928a418
Auto-generated-cl: translation import
2013-10-30 12:24:08 -07:00
Baligh Uddin
009b00408a Import translations. DO NOT MERGE
Change-Id: I59d6cf620cea6a1f4757ae94b3a6295ad8bbf1cd
Auto-generated-cl: translation import
2013-10-02 18:25:55 -07:00
Baligh Uddin
2852d97c93 Import translations. DO NOT MERGE
Change-Id: I7fd5f542f15b6498a90691a20478eecef7600069
Auto-generated-cl: translation import
2013-09-30 15:40:58 -07:00
Baligh Uddin
5b7fa95508 Import translations. DO NOT MERGE
Change-Id: I467cd4f65f68d103fa5ac474bd22d0b7c039450c
Auto-generated-cl: translation import
2013-09-23 15:03:33 -07:00
Baligh Uddin
1a7db4e249 Import translations. DO NOT MERGE
Change-Id: I0d1a4233203a8e68c714f80e1fd708aa1e1159ce
Auto-generated-cl: translation import
2013-09-19 03:57:26 -07:00
Baligh Uddin
f3cd0deb1e Import translations. DO NOT MERGE
Change-Id: I55ac03c2b04a1f2eea19318b8aeff3433723cd37
Auto-generated-cl: translation import
2013-08-26 15:07:01 -07:00
Baligh Uddin
d99de4a48b Import translations. DO NOT MERGE
Change-Id: Ic556df2deb575cdf9727b61ee6ed641a5886fd5a
Auto-generated-cl: translation import
2013-08-21 17:24:27 -07:00
Baligh Uddin
1c0972cbf8 Import translations. DO NOT MERGE
Change-Id: I73a26e6880296b7e281de575a83e16c9d4d325e0
Auto-generated-cl: translation import
2013-08-19 13:15:54 -07:00
Baligh Uddin
57a2e2b1b6 Import translations. DO NOT MERGE
Change-Id: I01f66240572840879243e0aff167956cd346a4a9
Auto-generated-cl: translation import
2013-08-14 15:47:35 -07:00