Paul Westbrook
|
47ee463729
|
resolved conflicts for merge of 19809304 to lmp-sprout-dev
Change-Id: Idf62af52625ad5c5a5b99d9f0067d49e9128b5e9
|
2014-11-02 10:33:04 -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 |
|
Baligh Uddin
|
c2061fb34a
|
Import translations. DO NOT MERGE
Change-Id: I4c4f519792f0c6e0fc21d0c768de5c979852280c
Auto-generated-cl: translation import
|
2014-10-19 16:24:48 -07:00 |
|
Geoff Mendal
|
586858745f
|
Import translations. DO NOT MERGE
Change-Id: Ib25f13dd8347d95126da1b6a8c1f21c1470723a5
Auto-generated-cl: translation import
|
2014-10-15 07:14:56 -07:00 |
|
Geoff Mendal
|
fc3b5cae3b
|
Import translations. DO NOT MERGE
Change-Id: I6b0cf46470c425b2c49207b0294c400476f84bef
Auto-generated-cl: translation import
|
2014-10-13 12:17:24 -07:00 |
|
Geoff Mendal
|
2a1daaae4d
|
Import translations. DO NOT MERGE
Change-Id: Id77138c228e8a50336b8a9c6fce144b659fa6d29
Auto-generated-cl: translation import
|
2014-10-08 10:15:55 -07:00 |
|
Baligh Uddin
|
d54cebe5ec
|
Import translations. DO NOT MERGE
Change-Id: I2a3a04830ee77f12c0e03932fe1287eda569fba4
Auto-generated-cl: translation import
|
2014-09-20 11:36:41 -07:00 |
|
Baligh Uddin
|
25231ac72b
|
Import translations. DO NOT MERGE
Change-Id: Ice143264dc53f4f738e2f4808b3719155af4aa67
Auto-generated-cl: translation import
|
2014-09-14 16:49:18 -07:00 |
|
Baligh Uddin
|
efca9af619
|
Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
|
2014-09-11 15:25:52 +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
|
96e7363894
|
Import translations. DO NOT MERGE
Change-Id: I2e4c6a34f20dc9e1e61020dea0d84ab709e7866d
Auto-generated-cl: translation import
|
2014-09-08 10:36:10 -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
|
1c0aa4c0fc
|
Import translations. DO NOT MERGE
Change-Id: I9166fd2125b3151a994c654a1c52dd54d8ada643
Auto-generated-cl: translation import
|
2014-08-26 09:18: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
|
ea99a05733
|
Import translations. DO NOT MERGE
Change-Id: I8449b7fd0a2636b78453332a99452ac688daf15b
Auto-generated-cl: translation import
|
2014-08-14 20:28:06 -07:00 |