Commit Graph

38306 Commits (0c6b903327fb22d362d7de4bc478dbdf8de96711)

Author SHA1 Message Date
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
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 04d3daff80 am 87c8e92d: (-s ours) am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '87c8e92deaad8f10304f801224a6f9fe4400e879':
  Import translations. DO NOT MERGE
2015-07-13 16:09:05 +00:00
Geoff Mendal a198e66dbe am 2e3d5f56: (-s ours) am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2e3d5f561fed0874f5260b467af20fc04edf85a7':
  Import translations. DO NOT MERGE
2015-07-13 16:09:04 +00:00
Geoff Mendal 13f19708a2 am 718b0b16: (-s ours) am 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '718b0b16e5d7f438c0fbfd08c8beab33c4d806fa':
  Import translations. DO NOT MERGE
2015-07-13 16:09:03 +00:00
Geoff Mendal c0414658d1 am 475a4a0a: (-s ours) am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '475a4a0a00642433d552ef3273202804d1baeec5':
  Import translations. DO NOT MERGE
2015-07-13 16:09:01 +00:00
Jatin Matani 5133782e9b am 9e87bcea: am c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit '9e87bcea51de1c2a27a22ce7180290e27cf033c0':
  Bring back shortcuts and add to dictionary UI
2015-07-13 16:09:00 +00:00
Geoff Mendal 87c8e92dea am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2676508c490833104929db90c4d82177dd38ab0e':
  Import translations. DO NOT MERGE
2015-07-13 15:56:26 +00:00
Geoff Mendal 2e3d5f561f am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1bea2964fa709a5c06a5d4bf004c16425f87bc51':
  Import translations. DO NOT MERGE
2015-07-13 15:56:22 +00:00
Geoff Mendal 718b0b16e5 am 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '5b704f8457ac4ca5b2ca6b0e8372ab88e51d83c1':
  Import translations. DO NOT MERGE
2015-07-13 15:56:19 +00:00
Geoff Mendal 475a4a0a00 am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '9fe7781171024a5046374d9c62d7c5affa049dc0':
  Import translations. DO NOT MERGE
2015-07-13 15:56:18 +00:00
Jatin Matani 9e87bcea51 am c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit 'c3f9f1d50b0e03deb78eff17d0ec2ffd522b792c':
  Bring back shortcuts and add to dictionary UI
2015-07-13 15:56:16 +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
Geoff Mendal 9fe7781171 am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '83c781e46c3d3d186595ef0c31a3d544edfcf62a':
  Import translations. DO NOT MERGE
2015-07-13 15:32:35 +00:00
Jatin Matani c3f9f1d50b am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit '4d7a7780395a2376b566452646d1a241e165c3bf':
  Bring back shortcuts and add to dictionary UI
2015-07-13 15:32:33 +00:00
Geoff Mendal 4203b5d8d8 am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '85a156223ceee5340ca7b6c31854d2e7ec38e0ff':
  Import translations. DO NOT MERGE
2015-07-13 15:09:37 +00:00
Geoff Mendal 7bceb2e379 am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0975cce068471874de7004b1bfb73f76b06bbe05':
  Import translations. DO NOT MERGE
2015-07-13 15:09:36 +00:00
Geoff Mendal d28a54a831 am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b2fe54720bcf1d233f837e8528c344f6375177ee':
  Import translations. DO NOT MERGE
2015-07-13 15:09:34 +00:00
Geoff Mendal 83c781e46c am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '98c4eba2cea310863f551af07a9c122e50ef425d':
  Import translations. DO NOT MERGE
2015-07-13 15:09:33 +00:00
Jatin Matani 0dacfff5d1 resolved conflicts for merge of d711426a to mnc-dr-dev
Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
2015-07-13 03:01:27 -07:00
Geoff Mendal 85a156223c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 17:02:40 +00:00
Geoff Mendal 284b504146 Import translations. DO NOT MERGE
Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971
Auto-generated-cl: translation import
2015-07-11 09:59:49 -07:00
Geoff Mendal 0975cce068 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 16:57:33 +00:00
Geoff Mendal 15bf32100f Import translations. DO NOT MERGE
Change-Id: I8686627b551188696543ab94fff742a02e6e27cc
Auto-generated-cl: translation import
2015-07-11 09:56:44 -07:00
Geoff Mendal b2fe54720b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 16:56:12 +00:00
Geoff Mendal bcbb0779e5 Import translations. DO NOT MERGE
Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7
Auto-generated-cl: translation import
2015-07-11 09:51:45 -07:00
Geoff Mendal 98c4eba2ce Import translations. DO NOT MERGE
Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5
Auto-generated-cl: translation import
2015-07-11 09:50:37 -07:00
Geoff Mendal 9dc7aab77b Import translations. DO NOT MERGE
Change-Id: I566767b9e742ccae64b0935b80b8baba90bb247b
Auto-generated-cl: translation import
2015-07-11 06:51:49 -07:00
Jatin Matani 4d7a778039 am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit '8c2591eec80dbe44158b1613cd96056057a41139':
  Bring back shortcuts and add to dictionary UI
2015-07-11 02:28:19 +00:00
Jatin Matani 9cd60fe1bb keep history after reset to ub-latinimegoogle-fava-release
This build IS suitable for public release
2015-07-10 19:45:20 +00:00
The Android Automerger 01f042ccfa merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-07-09 21:06:58 +00:00
Jatin Matani d711426a87 Remove android.util.Log from FileUtils
FileUtils is being used for other non android projects
and hence breaks when built. Instead use the log statements
at caller to record Log.e messages. Hence there is no side
effect here.

Bug:22042371
Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2
2015-07-09 11:50:10 -07:00
Geoff Mendal cb39ce86f5 Merge "Import translations. DO NOT MERGE" 2015-07-08 12:35:39 +00:00
Geoff Mendal f7b2fd38ad Import translations. DO NOT MERGE
Change-Id: Ib173a3361b770200c40bf2db4dcd52a8beb54e50
Auto-generated-cl: translation import
2015-07-08 05:33:01 -07:00
Geoff Mendal 3033efed56 Import translations. DO NOT MERGE
Change-Id: I9248fb41219930b51fdda827ee9a7c03a8bb6965
Auto-generated-cl: translation import
2015-07-08 05:28:54 -07:00
The Android Automerger a48d1b0e35 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-07-07 19:00:33 +00:00
Jatin Matani 8c2591eec8 Bring back shortcuts and add to dictionary UI
For JB and lower devices, the UI is surfaced by the IME.
Bug: 22200135
Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e
2015-07-06 17:32:13 -07:00
Geoff Mendal dbb032557f Merge "Import translations. DO NOT MERGE" 2015-07-06 12:22:28 +00:00
Geoff Mendal 265615d398 Merge "Import translations. DO NOT MERGE" 2015-07-06 12:22:04 +00:00
Geoff Mendal 6ace1974ad Import translations. DO NOT MERGE
Change-Id: I9a25a4fd8071b08dc2c12053c8df5c925cb6c493
Auto-generated-cl: translation import
2015-07-06 05:14:40 -07:00