Commit graph

38191 commits

Author SHA1 Message Date
Geoff Mendal
93193ccf43 am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '896e619e52c8d01317d56f458f3bc7a9c5317e0b':
  Import translations. DO NOT MERGE
2015-07-15 17:17:46 +00:00
Geoff Mendal
d534affcdb am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c9664084c71c97d9ace82ff5184f02e743273a41':
  Import translations. DO NOT MERGE
2015-07-15 17:17:43 +00:00
Geoff Mendal
95b0388afa am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e45179a2afad7c9b679e5242a0606ec342538c82':
  Import translations. DO NOT MERGE
2015-07-15 17:17:39 +00:00
Geoff Mendal
751f64dfe2 am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b':
  Import translations. DO NOT MERGE
2015-07-15 17:17:35 +00:00
Geoff Mendal
c73fabf608 am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b8d881f2505be5511f21ec2de86bc3e8523c3643':
  Import translations. DO NOT MERGE
2015-07-15 17:17:33 +00:00
Geoff Mendal
68c112b652 am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '63917040f1143c036ff480cee3e26790eaddb263':
  Import translations. DO NOT MERGE
2015-07-15 17:17:31 +00:00
Geoff Mendal
983dcbd1f8 am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit 'cc34158af0bf5318a33d74fed3e01de32a62149a':
  Import translations. DO NOT MERGE
2015-07-15 17:17:29 +00:00
Qiwen Zhao
16b9a0ba09 am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '247aef7564be66179a988e74bd695c324e36f6dd':
2015-07-15 17:17:27 +00:00
Qiwen Zhao
2bc2b351eb am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
2015-07-15 17:17:27 +00:00
Geoff Mendal
896e619e52 am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ef1cb855a84173417089715a595ecba6c6cde4ca':
  Import translations. DO NOT MERGE
2015-07-15 17:08:41 +00:00
Geoff Mendal
c9664084c7 am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f72e120216d591f6ed1a9aa69d34009d69848108':
  Import translations. DO NOT MERGE
2015-07-15 17:08:40 +00:00
Geoff Mendal
e45179a2af am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c':
  Import translations. DO NOT MERGE
2015-07-15 17:08:37 +00:00
Geoff Mendal
4a44f43348 am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4':
  Import translations. DO NOT MERGE
2015-07-15 17:08:35 +00:00
Geoff Mendal
b8d881f250 am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cce9728e2b838642c85e30978854793b481954d2':
  Import translations. DO NOT MERGE
2015-07-15 17:08:33 +00:00
Geoff Mendal
63917040f1 am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57':
  Import translations. DO NOT MERGE
2015-07-15 17:08:32 +00:00
Geoff Mendal
cc34158af0 am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9':
  Import translations. DO NOT MERGE
2015-07-15 17:08:30 +00:00
Qiwen Zhao
247aef7564 am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
2015-07-15 17:08:30 +00:00
Geoff Mendal
ef1cb855a8 am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a':
  Import translations. DO NOT MERGE
2015-07-15 16:54:11 +00:00
Geoff Mendal
f72e120216 am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
  Import translations. DO NOT MERGE
2015-07-15 16:54:10 +00:00
Geoff Mendal
a6d8425760 am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
  Import translations. DO NOT MERGE
2015-07-15 16:54:09 +00:00
Geoff Mendal
d6cba73e4c am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7':
  Import translations. DO NOT MERGE
2015-07-15 16:54:08 +00:00
Geoff Mendal
cce9728e2b am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cf849b40df13546046d3d7c89dc63c3e8b354976':
  Import translations. DO NOT MERGE
2015-07-15 16:54:06 +00:00
Geoff Mendal
74d4fdc31c am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '29217bcd651d1ab968d01744533aec009fe252da':
  Import translations. DO NOT MERGE
2015-07-15 16:54:05 +00:00
Geoff Mendal
16ad029311 am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '285c9d825d53a76548079ad527c4c79fda69ada1':
  Import translations. DO NOT MERGE
2015-07-15 16:54:03 +00:00
Geoff Mendal
7d5fb3a943 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:48:45 +00:00
Geoff Mendal
6aea6b9da7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:56 +00:00
Geoff Mendal
1aceaa3c2b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:44 +00:00
Geoff Mendal
c8e261e95b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:46:10 +00:00
Geoff Mendal
cf849b40df Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:44:45 +00:00
Geoff Mendal
29217bcd65 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:41:49 +00:00
Geoff Mendal
f98a60cc43 Import translations. DO NOT MERGE
Change-Id: Iebd6e5f51a121cae7913e6ac21c4140b9c4de6f9
Auto-generated-cl: translation import
2015-07-15 09:41:01 -07:00
Geoff Mendal
90a6cdb26a Import translations. DO NOT MERGE
Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9
Auto-generated-cl: translation import
2015-07-15 09:37:13 -07:00
Geoff Mendal
8b8df7dcf1 Import translations. DO NOT MERGE
Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25
Auto-generated-cl: translation import
2015-07-15 09:34:54 -07:00
Geoff Mendal
41bffb1293 Import translations. DO NOT MERGE
Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3
Auto-generated-cl: translation import
2015-07-15 09:33:27 -07:00
Geoff Mendal
e3e9026a3a Import translations. DO NOT MERGE
Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7
Auto-generated-cl: translation import
2015-07-15 09:31:30 -07:00
Geoff Mendal
a00589437e Import translations. DO NOT MERGE
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
2015-07-15 09:30:20 -07:00
Geoff Mendal
285c9d825d Import translations. DO NOT MERGE
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
2015-07-15 09:28:54 -07:00
Qiwen Zhao
1d1441d32a DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe 2015-07-13 16:40:05 -07:00
Qiwen Zhao
e862217461 DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe 2015-07-13 16:35:27 -07:00
Qiwen Zhao
490701a3fe DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. 2015-07-13 15:29:05 -07:00
Jatin Matani
80c9bfbd28 resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
2015-07-13 10:40:26 -07:00
The Android Automerger
1e14b4597f am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '98aaffaafe9246f7e3b2aff4ff605b5fbbed9f69':
2015-07-13 17:29:50 +00:00
The Android Automerger
98aaffaafe am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit 'b4b19735182767df88f3a196a94c4a943423e72b':
2015-07-13 17:19:40 +00:00
The Android Automerger
b4b1973518 am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '01f042ccfa4530e7be2c01dbda5ed4a296ba535e':
2015-07-13 16:52:52 +00:00
Qiwen Zhao
741b6acbf8 am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa':
  Remove android.util.Log from FileUtils
2015-07-13 16:32:52 +00:00
Qiwen Zhao
c8edecc543 am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60':
  Remove android.util.Log from FileUtils
2015-07-13 16:20:59 +00:00
Qiwen Zhao
32afc638e9 Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev 2015-07-13 16:10:21 +00:00
Geoff Mendal
2676508c49 am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e':
  Import translations. DO NOT MERGE
2015-07-13 15:32:40 +00:00
Geoff Mendal
1bea2964fa am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '7bceb2e3791a2c4d010fd770eceef203099f2a11':
  Import translations. DO NOT MERGE
2015-07-13 15:32:38 +00:00
Geoff Mendal
5b704f8457 am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9':
  Import translations. DO NOT MERGE
2015-07-13 15:32:36 +00:00