Commit Graph

38298 Commits (12864c6f44a660796e1e6c8b30dd14c666ad083f)

Author SHA1 Message Date
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
Geoff Mendal 2e0741da81 Merge "Import translations. DO NOT MERGE" 2015-07-15 12:20:00 +00:00
Geoff Mendal e475916ee6 Merge "Import translations. DO NOT MERGE" 2015-07-15 12:19:46 +00:00
Geoff Mendal 6fcd76fa65 Merge "Import translations. DO NOT MERGE" 2015-07-15 12:19:19 +00:00
Geoff Mendal 860bb72677 Merge "Import translations. DO NOT MERGE" 2015-07-15 12:19:05 +00:00
Geoff Mendal d7cb3faca7 Merge "Import translations. DO NOT MERGE" 2015-07-15 12:18:32 +00:00
Geoff Mendal 66d293a6fc Merge "Import translations. DO NOT MERGE" 2015-07-15 12:17:36 +00:00
Geoff Mendal c87fa1046a Import translations. DO NOT MERGE
Change-Id: I902a7ba3ad4374dae7af5a86fae37c7fbb9f611f
Auto-generated-cl: translation import
2015-07-15 05:08:56 -07:00
Geoff Mendal 55918d50bb Import translations. DO NOT MERGE
Change-Id: Ibb224238f36380adb49ea9ba2059a44e0bd6a004
Auto-generated-cl: translation import
2015-07-15 05:08:07 -07:00
Geoff Mendal d9cdd9bc0b Import translations. DO NOT MERGE
Change-Id: I824270b06a5f72038f98c7259107e4984bce25b8
Auto-generated-cl: translation import
2015-07-15 05:06:49 -07:00
Geoff Mendal 41a55e2034 Import translations. DO NOT MERGE
Change-Id: I9bd02d5316ff4c15a713bd79345382ae79f2e4d8
Auto-generated-cl: translation import
2015-07-15 05:06:00 -07:00
Geoff Mendal 9468a345e3 Import translations. DO NOT MERGE
Change-Id: I52fbd93b2ddb4f78926ecd7db84c8506dff48b28
Auto-generated-cl: translation import
2015-07-15 05:04:44 -07:00
Geoff Mendal 43b12a09d7 Import translations. DO NOT MERGE
Change-Id: I77f00be6e8d3b966f60fef0c66a6e98c44180d19
Auto-generated-cl: translation import
2015-07-15 05:04:06 -07:00
Geoff Mendal a5703d5af1 Import translations. DO NOT MERGE
Change-Id: If3d7ed1987e024974263084f4233b8b549f09381
Auto-generated-cl: translation import
2015-07-15 05:03:12 -07:00
Qiwen Zhao ca2d76a91e DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe 2015-07-13 16:46:26 -07:00
Qiwen Zhao 0a0acc3b8d DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe 2015-07-13 16:42:43 -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
The Android Automerger 8ee3f8f65a am b6679556: am 1e14b459: am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit 'b66795562b56a4adc942f94e13e164d7a13a8b1e':
2015-07-13 22:39:06 +00:00
Qiwen Zhao cbf4948097 am 0564deb1: (-s ours) am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '0564deb185675b53081befffe48ccac9a0b4dcca':
  Remove android.util.Log from FileUtils
2015-07-13 22:39:02 +00:00
Qiwen Zhao 490701a3fe DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. 2015-07-13 15:29:05 -07:00
The Android Automerger b66795562b am 1e14b459: am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '1e14b4597feda704782ec8f5b7783c66aabdaa94':
2015-07-13 17:45:41 +00: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 0564deb185 am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6':
  Remove android.util.Log from FileUtils
2015-07-13 16:46:24 +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