Commit graph

38791 commits

Author SHA1 Message Date
Geoff Mendal
b9acf8e40e am a8aab1d6: (-s ours) am c634cbe1: (-s ours) am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'a8aab1d61d8e06b75103b6cb34fb5646896b9c01':
2015-03-26 21:24:11 +00:00
Geoff Mendal
1434aeba6e am 137cc5d3: (-s ours) am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '137cc5d34e147339948f60f52564679be32a99db':
2015-03-26 21:24:08 +00:00
Geoff Mendal
d908fc8d78 am 39befa78: (-s ours) am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '39befa785c1fdbbbd72e10ea0aea7a6f6e09febc':
2015-03-26 21:24:06 +00:00
Geoff Mendal
408328bc44 am e7382bb5: (-s ours) am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e7382bb53ca367ba4131d3213be618c80cbe0c5f':
2015-03-26 21:24:04 +00:00
Geoff Mendal
564fe3059a am e50efc30: (-s ours) am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e50efc30727d3beb90c3181b6d567bec012280a1':
2015-03-26 21:24:01 +00:00
Geoff Mendal
6b0dbf2ff6 am 48c03762: (-s ours) am b3cde203: (-s ours) am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '48c03762e876b359d4b688a63793cdc0615aee74':
2015-03-26 21:23:59 +00:00
Geoff Mendal
0dcc354eda am ec71a217: (-s ours) am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ec71a21787c94c0698f98316a6189d3a472bdb88':
2015-03-26 21:19:12 +00:00
Geoff Mendal
a8aab1d61d am c634cbe1: (-s ours) am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'c634cbe14365bac44a2bb671ede6534566ac22b8':
2015-03-26 21:19:11 +00:00
Geoff Mendal
137cc5d34e am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'b48a6519cc412aae55ef8914209b09d87f801603':
2015-03-26 21:19:09 +00:00
Geoff Mendal
39befa785c am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3d26af838690fddf9227050b18c8b03441b602c1':
2015-03-26 21:19:07 +00:00
Geoff Mendal
e7382bb53c am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'b5cac10334ebe1640ab39039b6fbcbac818cb75a':
2015-03-26 21:19:03 +00:00
Geoff Mendal
e50efc3072 am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '01072c69f184b0a9c513bdddd0e3f2266e0abe8f':
2015-03-26 21:19:02 +00:00
Geoff Mendal
48c03762e8 am b3cde203: (-s ours) am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit 'b3cde203fd67230bbbfa1421d265bb211359905c':
2015-03-26 21:19:00 +00:00
Geoff Mendal
ec71a21787 am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '75a054602c2770fa66d85d22466f20ca2cdf7694':
2015-03-26 21:09:18 +00:00
Geoff Mendal
c634cbe143 am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '78939d63861176fbc42008fa86a2de45cad2bbf5':
2015-03-26 21:09:16 +00:00
Geoff Mendal
b48a6519cc am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'fa18dac7980dcf030757fcd9f0cb9774f65e7f6e':
2015-03-26 21:09:15 +00:00
Geoff Mendal
3d26af8386 am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '341f7ea74b30371a464994544244a8e1c0327277':
2015-03-26 21:09:13 +00:00
Geoff Mendal
b5cac10334 am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '22f10ac4016c6879f55d65b16765440ff9453f58':
2015-03-26 21:09:12 +00:00
Geoff Mendal
01072c69f1 am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
2015-03-26 21:09:10 +00:00
Geoff Mendal
b3cde203fd am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit 'bbec724b2ae4677685a7300ae4b0c1e820cdf33a':
2015-03-26 21:09:09 +00:00
Geoff Mendal
75a054602c am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ef9b3c13231328e13981d979100063403f4c5768':
2015-03-26 21:05:40 +00:00
Geoff Mendal
78939d6386 am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '4172b16afadaf00168b663464d122213f664923c':
2015-03-26 21:05:38 +00:00
Geoff Mendal
fa18dac798 am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '116b058bfb410c2c3bf0c9436645c842406d99b5':
2015-03-26 21:05:37 +00:00
Geoff Mendal
341f7ea74b am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':
2015-03-26 21:05:32 +00:00
Geoff Mendal
22f10ac401 am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
2015-03-26 21:05:31 +00:00
Geoff Mendal
b2a45cdc1f am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':
2015-03-26 21:05:29 +00:00
Geoff Mendal
bbec724b2a am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':
2015-03-26 21:05:27 +00:00
Geoff Mendal
ef9b3c1323 am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e397cbe2dffe3c7ff81567a8992f66e34df1d495':
2015-03-26 21:00:41 +00:00
Geoff Mendal
4172b16afa am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '92aaaa88d31e21ca72d24ad047195779be83bdcd':
2015-03-26 21:00:40 +00:00
Geoff Mendal
116b058bfb am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '013b37a7e91e27eb060a6a23ac607a7172f2b058':
2015-03-26 21:00:38 +00:00
Geoff Mendal
8dc2209ebf am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':
2015-03-26 21:00:37 +00:00
Geoff Mendal
7424f8c587 am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
2015-03-26 21:00:35 +00:00
Geoff Mendal
6b26d9d4fa am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':
2015-03-26 21:00:33 +00:00
Geoff Mendal
043af5575e am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
2015-03-26 21:00:31 +00:00
The Android Automerger
f5c7b5a9f6 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-26 19:00:26 +00:00
Geoff Mendal
e397cbe2df am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a':
  Import translations. DO NOT MERGE
2015-03-26 18:56:21 +00:00
Geoff Mendal
92aaaa88d3 am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9206174e6ba94bb2b11871c983c74989684ecf4f':
  Import translations. DO NOT MERGE
2015-03-26 18:56:18 +00:00
Geoff Mendal
013b37a7e9 am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57':
  Import translations. DO NOT MERGE
2015-03-26 18:56:15 +00:00
Geoff Mendal
3a496eb86c am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24':
  Import translations. DO NOT MERGE
2015-03-26 18:56:12 +00:00
Geoff Mendal
585f624ba5 am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201':
  Import translations. DO NOT MERGE
2015-03-26 18:56:08 +00:00
Geoff Mendal
256e2ffddf am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'cad0777a4bade34d6bedd096eae712e29df99fc1':
  Import translations. DO NOT MERGE
2015-03-26 18:55:58 +00:00
Geoff Mendal
f4d53d6fda am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc':
  Import translations. DO NOT MERGE
2015-03-26 18:55:57 +00:00
Mohammadinamul Sheik
f24e19741f am 8f526c9a: Use the complete Locale in generating the dictionary id.
* commit '8f526c9a55e0b30f81dcca07dc4f5f4fd341bdb1':
  Use the complete Locale in generating the dictionary id.
2015-03-26 03:44:23 +00:00
Mohammadinamul Sheik
8f526c9a55 Use the complete Locale in generating the dictionary id.
- Also deleted a couple of dead methods.

Bug:19929051
Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
2015-03-25 16:45:56 -07:00
Geoff Mendal
af295fcd7f am 622093dd: (-s ours) Import translations. DO NOT MERGE
* commit '622093dd3a33c711f107424d152d02fe2e4adf14':
  Import translations. DO NOT MERGE
2015-03-25 13:42:53 +00:00
Geoff Mendal
d858dbce9a Import translations. DO NOT MERGE
Change-Id: Icf917a7c5cfef90668c1a3646c8faa436cdb4eeb
Auto-generated-cl: translation import
2015-03-25 06:36:28 -07:00
Geoff Mendal
622093dd3a Import translations. DO NOT MERGE
Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3
Auto-generated-cl: translation import
2015-03-25 06:32:16 -07:00
Geoff Mendal
6fd178a6f0 Import translations. DO NOT MERGE
Change-Id: I22ca6baef73303e5ff28b0503fefe050eefd10a1
Auto-generated-cl: translation import
2015-03-25 06:27:07 -07:00
The Android Automerger
e8b86f47a8 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-25 00:40:32 +00:00
Jatin Matani
059c335f4e am 3b175a0b: Merge "Check for accounts when enabling sync features."
* commit '3b175a0b5d1355ed8f220cd39e5b74e9ee565371':
  Check for accounts when enabling sync features.
2015-03-24 23:43:48 +00:00