Commit Graph

11498 Commits (1d256c8ee92b63be4a160f2ba31a7df4d678095b)

Author SHA1 Message Date
Jean Chalard cf66902f69 am 0978aa71: am 50c12c83: Merge "[HS2] Move more stuff to onStartInput" into lmp-dev
* commit '0978aa71ea91583c0b8d7e2588549fbb56953e7e':
  [HS2] Move more stuff to onStartInput
2014-08-06 17:38:11 +00:00
Jean Chalard 1f3d89c2af Revert "[HS1] Save some data in startInputView"
This reverts commit f1accd4f04.

Bug: 16830599
Change-Id: I4c9367f742b8ee8463920e91263b05c2195f8480
2014-08-06 18:36:55 +09:00
Jean Chalard 772a8019ef Revert "[HS2] Move more stuff to onStartInput"
This reverts commit 93b00a314e.

Bug: 16830599
Change-Id: I955e7da77978c3a495660aa29247e010d489c36b
2014-08-06 18:36:29 +09:00
Jean Chalard ef74e737f5 Introduce onEvent() to improve testability
...and prepare for the future

Change-Id: Ieed96ab552993fd148e80b9c3355f1b569bd716f
2014-08-06 07:29:35 +00:00
Jean Chalard 9273f3832b [HS3] Fix a bug on ICS
There is a bug in ICS where the input connection won't take
any writing commands after rotation until the cursor moves.
This fixes it by wiggling the cursor position once before trying
to do anything.

Bug: 16810766
Change-Id: Ib14c70bd0550420cecfa86dea501d13a1a91e296
2014-08-06 11:38:11 +09:00
Tadashi G. Takaoka a58d78ec89 am 9cca3c83: am a262144d: Add ViewCompatUtils.setElevation
* commit '9cca3c8359e30e15a50f60773fd19571659c3dc1':
  Add ViewCompatUtils.setElevation
2014-08-05 13:26:01 +00:00
Tadashi G. Takaoka c64769207d am eceefd07: am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
* commit 'eceefd0725c4f727f44e9c65a82970ead15e3566':
  Remove unnecessarily overridden defaultEnterKeyStyle
2014-08-05 13:25:59 +00:00
Jean Chalard 6745f337c1 am d5c89d64: am 6474ef99: Merge "[HW16] Implement processing event chains." into lmp-dev
* commit 'd5c89d64901f1fe7085e6c217d0c2fc19853b032':
  [HW16] Implement processing event chains.
2014-08-05 13:25:58 +00:00
Tadashi G. Takaoka 139e54a26d am c34a3842: am 8cbb4eb9: Merge "Make popup hint letter theme-aware" into lmp-dev
* commit 'c34a3842120078d921e69ed839873e430d6a674b':
  Make popup hint letter theme-aware
2014-08-05 13:25:56 +00:00
Jean Chalard 377825942e am 5a91e4fa: am f69bb4c7: [HW15] Pass events instead of reading them from the transaction
* commit '5a91e4fa909633ee2e9eaf8055b56228a79380a5':
  [HW15] Pass events instead of reading them from the transaction
2014-08-05 13:25:55 +00:00
Jean Chalard c36e679eb3 am b8c1075a: am 1b9f7c96: Merge "[HW14] Cleanup" into lmp-dev
* commit 'b8c1075a8f5ab62998056462b9c25ef848305019':
  [HW14] Cleanup
2014-08-05 13:25:52 +00:00
Jean Chalard 28632211ef am b5c862f8: am c710b34e: Merge "[HW13] Split up onCodeInput" into lmp-dev
* commit 'b5c862f8f942a3ae201cc6a657de9479340d1ad3':
  [HW13] Split up onCodeInput
2014-08-05 13:25:51 +00:00
Tadashi G. Takaoka a262144dcb Add ViewCompatUtils.setElevation
Bug: 16210054
Change-Id: I632158951a60ab527246410caefd9fbe471dd859
2014-08-05 18:56:24 +09:00
Tadashi G. Takaoka 689064d0a2 Remove unnecessarily overridden defaultEnterKeyStyle
The overriding defaultEnterKeyStyle was needed because there were two
Key's attributes to control key's visual, keyLabel and
keyIcon. Because these were merged into one keySpec attribute, there
is no need to override defaultEnterKeyStyle.

Bug: 16787857
Change-Id: I78ca2c7c9349e4532c67e8d6468a5b98309adc05
2014-08-05 09:54:02 +00:00
Jean Chalard f69bb4c7a3 [HW15] Pass events instead of reading them from the transaction
It's probably cleaner to just pass the events rather than read
them from a transaction, especially when a transaction may be
associated with several events in a chain.

Change-Id: I27830f0f3f3f32fe77ea8b9cad505b7ebee648af
2014-08-05 15:37:01 +09:00
Geoff Mendal 6bda487355 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-08-05 00:29:22 +00:00
Geoff Mendal bd77de8e06 Import translations. DO NOT MERGE
Change-Id: Ib34f1de1993c3e31f1f64b7476a9517feb511bdd
Auto-generated-cl: translation import
2014-08-06 13:20:25 -07:00
Tadashi G. Takaoka 7938392bd8 am 28b8f349: am 94a568a8: am 868395c6: Merge "Mark hind_compact layout as completed" into lmp-dev
* commit '28b8f349dfce8aa41a5cefd0d51ed8c7e01f8774':
  Mark hind_compact layout as completed
2014-08-06 17:47:54 +00:00
Jean Chalard 41eecbfb31 am 78d9b7c4: am bc043c31: am 1f3d89c2: Revert "[HS1] Save some data in startInputView"
* commit '78d9b7c4a03ecfcd72569b8304b9156119e9eb29':
  Revert "[HS1] Save some data in startInputView"
2014-08-06 17:47:53 +00:00
Jean Chalard 66f243fef1 am bd38799e: am fe807696: am 772a8019: Revert "[HS2] Move more stuff to onStartInput"
* commit 'bd38799e27dd2c43444b84a47dcb1228b4932fb5':
  Revert "[HS2] Move more stuff to onStartInput"
2014-08-06 17:47:52 +00:00
Tadashi G. Takaoka 62ef771813 am c8b860e3: am 571320ad: am 5dee1fd6: Merge "Add dedicated background for custom action label key" into lmp-dev
* commit 'c8b860e3e106f714751143a1857408f1a2cb6259':
  Add dedicated background for custom action label key
2014-08-06 17:47:50 +00:00
Jean Chalard 2d6f87df6f am 09ae6b91: am 922411a7: am ef74e737: Introduce onEvent() to improve testability
* commit '09ae6b9119a5a86165738cba94ae40c059d9f600':
  Introduce onEvent() to improve testability
2014-08-06 17:47:48 +00:00
Jean Chalard acc827b8dd am 43cf1ae7: am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev
* commit '43cf1ae7bb2e2e5c917b27ce9669ae12e547c15f':
  Fix an NPE when running with Keep.
2014-08-06 17:47:45 +00:00
Tadashi G. Takaoka 2809183cb6 am 0bfcb89a: am e8668c2e: am aa3ff194: Merge "Use add icon for add custom input style menu" into lmp-dev
* commit '0bfcb89ac4202fb7d53f5c82ec27f8f87fa0cea1':
  Use add icon for add custom input style menu
2014-08-06 17:47:44 +00:00
Jean Chalard 784484da0b am d393cf06: am 98e27483: am 9273f383: [HS3] Fix a bug on ICS
* commit 'd393cf065ab042cc78f7a51010161425080afd1d':
  [HS3] Fix a bug on ICS
2014-08-06 17:47:41 +00:00
Jean Chalard 37389193c8 am cf66902f: am 0978aa71: am 50c12c83: Merge "[HS2] Move more stuff to onStartInput" into lmp-dev
* commit 'cf66902f69911cc80da5b3a9e39634b0bc9ca343':
  [HS2] Move more stuff to onStartInput
2014-08-06 17:47:39 +00:00
Tadashi G. Takaoka c83113bbc1 am a58d78ec: am 9cca3c83: am a262144d: Add ViewCompatUtils.setElevation
* commit 'a58d78ec896b0d8bb80e9ab028af8766defd0261':
  Add ViewCompatUtils.setElevation
2014-08-05 13:30:40 +00:00
Tadashi G. Takaoka c25dc2544e am c6476920: am eceefd07: am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
* commit 'c64769207d94c0b6515e7030a613c14bfc90ac3d':
  Remove unnecessarily overridden defaultEnterKeyStyle
2014-08-05 13:30:39 +00:00
Jean Chalard bc065f4d77 am 6745f337: am d5c89d64: am 6474ef99: Merge "[HW16] Implement processing event chains." into lmp-dev
* commit '6745f337c166cb1750e80ce9101bdbf57d2b6596':
  [HW16] Implement processing event chains.
2014-08-05 13:30:38 +00:00
Tadashi G. Takaoka df9f7c88ba am 139e54a2: am c34a3842: am 8cbb4eb9: Merge "Make popup hint letter theme-aware" into lmp-dev
* commit '139e54a26df783ea60e28812d63083844569bc52':
  Make popup hint letter theme-aware
2014-08-05 13:30:36 +00:00
Jean Chalard 385fbd9f8a am 37782594: am 5a91e4fa: am f69bb4c7: [HW15] Pass events instead of reading them from the transaction
* commit '377825942eca103c80f5f7e8fd9512bb9e3f1bbb':
  [HW15] Pass events instead of reading them from the transaction
2014-08-05 13:30:35 +00:00
Jean Chalard 27a0c9faf7 am c36e679e: am b8c1075a: am 1b9f7c96: Merge "[HW14] Cleanup" into lmp-dev
* commit 'c36e679eb32b5c48981f165e17f816271058924e':
  [HW14] Cleanup
2014-08-05 13:30:31 +00:00
Jean Chalard 9d6b5d108c am 28632211: am b5c862f8: am c710b34e: Merge "[HW13] Split up onCodeInput" into lmp-dev
* commit '28632211ef62c0d2d005b3ed92659f1ac6fbe05b':
  [HW13] Split up onCodeInput
2014-08-05 13:30:29 +00:00
Jean Chalard e433fb599b am 23cdb61a: am 82db6b45: am f1accd4f: [HS1] Save some data in startInputView
* commit '23cdb61a53c6ea69ff7075ac01fa8108f9d1cc12':
  [HS1] Save some data in startInputView
2014-08-05 04:02:17 +00:00
Jean Chalard 23cdb61a53 am 82db6b45: am f1accd4f: [HS1] Save some data in startInputView
* commit '82db6b45435ab93255d6406039be88b1d6998c2c':
  [HS1] Save some data in startInputView
2014-08-05 03:58:55 +00:00
Geoff Mendal 9c0b5b21eb Merge "Import translations. DO NOT MERGE" 2014-08-05 00:29:22 +00:00
Geoff Mendal f600192ea4 Import translations. DO NOT MERGE
Change-Id: Id120437f9e4d9a2e59dd07aba38bf6683a960142
Auto-generated-cl: translation import
2014-08-04 23:26:07 -07:00
Tadashi G. Takaoka 91f47b03fe Merge "Remove unused animation resources" into lmp-dev 2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka 9e7f0677bf Remove unused animation resources
Change-Id: Idc0670588bb51e6a2b3eac9489cb643db293815a
2014-08-07 16:24:02 +09:00
Tadashi G. Takaoka 0c2dc41029 Merge "Clean up Keyboard and KeyboardView theme" into lmp-dev 2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka ef231984ed Clean up Keyboard and KeyboardView theme
Change-Id: I745ed21b88fbdb1f3a16a71ebf3461d909ae448e
2014-08-07 16:16:31 +09:00
Tadashi G. Takaoka fd8b4522df (DO NOT MERGE) Remove preliminary keyboards from L
Change-Id: I9e1209b80b8919669b4496102b967220ab16146b
2014-08-07 13:00:34 +09:00
Ken Wakasa 3316dcd453 Merge "Revert "Introduce onEvent() to improve testability"" into lmp-dev 2014-08-05 00:07:36 +00:00
Ken Wakasa f5f5fb4b64 Revert "Introduce onEvent() to improve testability"
This reverts commit ef74e737f5.

Apparently, this CL broke several unit tests.

Change-Id: I86cf5f1ffb0214707afe99ee97f92ba8c5157f3f
2014-08-06 23:57:03 +00:00
Tadashi G. Takaoka 5dee1fd67d Merge "Add dedicated background for custom action label key" into lmp-dev 2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka 017e9f7e7f Add dedicated background for custom action label key
Bug: 15526978
Change-Id: Ia73d825c7e00097018822704e61272d0e448f39a
2014-08-06 17:23:14 +09:00
Jean Chalard c08c506487 Merge "Fix an NPE when running with Keep." into lmp-dev 2014-08-05 00:07:36 +00:00
Jean Chalard 411fa5909b Fix an NPE when running with Keep.
Change-Id: Ie703e14bff42d34608f11d0c2d7758950b84c88c
2014-08-06 13:00:05 +09:00
Tadashi G. Takaoka aa3ff194cd Merge "Use add icon for add custom input style menu" into lmp-dev 2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka f7d1dc2b5e Use add icon for add custom input style menu
Bug: 16805043
Change-Id: I9730a6aa5d761924457edaabcee25db930e20f02
2014-08-06 11:38:45 +09:00
Jean Chalard 93b00a314e [HS2] Move more stuff to onStartInput
Bug: 8152758
Change-Id: Ida05df7d151ceb582886e2ad06c5bdf0b59978ee
2014-08-06 11:14:47 +09:00
Jean Chalard 6474ef9925 Merge "[HW16] Implement processing event chains." into lmp-dev 2014-08-05 00:07:36 +00:00
Jean Chalard 0a2872cb44 [HW16] Implement processing event chains.
Change-Id: I4e1e4f101050ebda77c629a61c548d3c8efb330f
2014-08-05 15:37:01 +09:00
Ken Wakasa 0f2de75e31 Merge "Revert "Remove unused animation resources"" into lmp-dev 2014-08-05 00:03:09 +00:00
Ken Wakasa c083255b50 Revert "Remove unused animation resources"
This reverts commit 9e7f0677bf.

Due to unit test breakage.

Change-Id: I664c25c17fc4cc98264bdac772eac086c9fbc183
2014-08-07 11:39:22 +00:00
Ken Wakasa 5f57fe4ad0 Merge "Revert "Remove unused Key and Keyboard attributes"" into lmp-dev 2014-08-05 00:03:09 +00:00
Ken Wakasa 44e20f4fb4 Revert "Remove unused Key and Keyboard attributes"
This reverts commit cdcaa37a37.

Due to unit test breakage.

Change-Id: I1c22edf983f6e03a34b86d7c1fae3d3188447a75
2014-08-07 11:37:11 +00:00
Tadashi G. Takaoka cdcaa37a37 Remove unused Key and Keyboard attributes
This CL removes the following unused Key attributes
- Key.keyLabelFlags' followKeyLargeLabelRatio
- Keyboard.keyLargeLabelRatio

Change-Id: Ib4fb13cc7ca902ac1733ecf27bd284d07e10bc3e
2014-08-07 17:23:37 +09:00
Tadashi G. Takaoka e988e412d9 Merge "Add Key label off center attribute" into lmp-dev 2014-08-05 00:03:09 +00:00
Tadashi G. Takaoka ba49920e80 Add Key label off center attribute
This CL adds two Key attributes to control how much a label should be
off centered.
- keyLabelOffCenterRatio
- keyHintLabelOffCenterRatio

Bug: 14419121
Change-Id: I26650eefdd375f0eeca8a1ca6034a8339d2a3182
2014-08-07 14:39:57 +09:00
Jean Chalard c710b34e34 Merge "[HW13] Split up onCodeInput" into lmp-dev 2014-08-05 00:03:09 +00:00
Jean Chalard a88e95e07e [HW13] Split up onCodeInput
Change-Id: I503c5403dcaea5db632eba85ae3fae9ba9a1f946
2014-08-05 12:59:36 +09:00
Ken Wakasa 5218382141 Merge "Revert "Tune number letter size of Material keyboard"" into lmp-dev 2014-08-04 23:56:40 +00:00
Ken Wakasa 5ad718f2ca Revert "Tune number letter size of Material keyboard"
This reverts commit 44454c2b2b.

Due to unit test breakage.

Bug: 14419121
Change-Id: Id0bbc2276fc035aa090f7bb4fa8112a1aecd483f
2014-08-07 11:36:20 +00:00
Ken Wakasa 1c7e6f8d6e Merge "Revert "Align hint label to bottom"" into lmp-dev 2014-08-04 23:56:40 +00:00
Ken Wakasa 02c4a80afe Revert "Align hint label to bottom"
This reverts commit f1784266ec.

Due to unit test breakage.

Bug: 14419121
Change-Id: Ibc201649e71135292530b26337d9305a6681f446
2014-08-07 11:35:26 +00:00
Keisuke Kuroyanagi b6665d958a Merge "Use DistracterFilterCheckingIsInDictionary for User History" into lmp-dev 2014-08-04 23:56:40 +00:00
Keisuke Kuroyanagi 87ab5b0518 Use DistracterFilterCheckingIsInDictionary for User History
Bug: 13142176
Bug: 15531638
Change-Id: I7e4e5afa05c5cee6eedef62c053d81edac5fa6af
2014-08-07 18:39:06 +09:00
Tadashi G. Takaoka 6ba5d63628 Merge "Remove unused Key and Keyboard attributes" into lmp-dev 2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka 868395c637 Merge "Mark hind_compact layout as completed" into lmp-dev 2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka 3760803de6 Mark hind_compact layout as completed
Bug: 13779052
Change-Id: If87ee2edbcfec4ad0444d13c7bd502df88cac89a
2014-08-06 18:34:22 +09:00
Tadashi G. Takaoka 8cbb4eb984 Merge "Make popup hint letter theme-aware" into lmp-dev 2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka 3410e16907 Make popup hint letter theme-aware
Bug: 16351091
Change-Id: I6af18ea210c00916157138b9cfbeb073aee6ca1b
2014-08-05 17:32:53 +09:00
Jean Chalard 1b9f7c962c Merge "[HW14] Cleanup" into lmp-dev 2014-08-04 23:56:40 +00:00
Jean Chalard dd31a2dedf [HW14] Cleanup
Do away with the didAutoCorrect local variables which are
unnatural to return out of all these functions.

Change-Id: I22024004d2c489de018beff812c2c589bfd8ca32
2014-08-05 12:59:55 +09:00
Jean Chalard f1accd4f04 [HS1] Save some data in startInputView
Bug: 8152758
Change-Id: Ic57d3918b08e775769d4ba5d73ba5c31231e0d6a
2014-08-04 22:40:21 +09:00
Jean Chalard 890dfb7018 am 053352f2: am d9e41aac: am 85b7b967: Merge "[HW12] Use the consumed status of the Event." into lmp-dev
* commit '053352f283c77ae51e02ad2881a9b11017b85fe8':
  [HW12] Use the consumed status of the Event.
2014-08-04 04:27:51 +00:00
Jean Chalard 053352f283 am d9e41aac: am 85b7b967: Merge "[HW12] Use the consumed status of the Event." into lmp-dev
* commit 'd9e41aac3fdf6e81ed7f2487cd9c74c28734a5e2':
  [HW12] Use the consumed status of the Event.
2014-08-04 04:13:05 +00:00
Tadashi G. Takaoka aaa0f84053 am 530845cb: am 9681027a: am 03a1c442: Clean up compatible utility classes
* commit '530845cb5e03be07badba2a56e567519ae16bd60':
  Clean up compatible utility classes
2014-08-04 02:10:52 +00:00
Tadashi G. Takaoka 530845cb5e am 9681027a: am 03a1c442: Clean up compatible utility classes
* commit '9681027aade82febb2ba5e384d9c6f77511859d3':
  Clean up compatible utility classes
2014-08-04 02:07:36 +00:00
Tadashi G. Takaoka 03a1c442ae Clean up compatible utility classes
Change-Id: I95a682052037d292801477db0f05e04926b61412
2014-08-04 01:21:29 +00:00
Jean Chalard 1c129bf79a am 3d230119: am 9557e52e: am da5ccd9f: [HW11] Cleanup
* commit '3d230119bcf27f69f0ebe8e58b2b70b0f126da21':
  [HW11] Cleanup
2014-08-01 21:08:27 +00:00
Jean Chalard 3d230119bc am 9557e52e: am da5ccd9f: [HW11] Cleanup
* commit '9557e52ef43d33157f759cc02384d50480645a6f':
  [HW11] Cleanup
2014-08-01 21:00:12 +00:00
Jean Chalard 85b7b967b7 Merge "[HW12] Use the consumed status of the Event." into lmp-dev 2014-08-01 16:06:20 +00:00
Jean Chalard e0bad8e988 [HW12] Use the consumed status of the Event.
Change-Id: I1619f6132f8f71bc1291fd6a5604a5e1e3431ae2
2014-08-04 12:41:07 +09:00
Jean Chalard 2bac4e5ffe am dcd3d218: am 0b9d6140: am 00ee5f76: [HW10] Pull the processed event in its eventual place
* commit 'dcd3d2187cb078e4c374f3717a8fdecff708a785':
  [HW10] Pull the processed event in its eventual place
2014-07-31 13:40:45 +00:00
Jean Chalard a6622bdce6 am 3d663a0a: am 1711c2aa: am f290d407: [HW9] Pull the processed event further.
* commit '3d663a0a9d4ee37bddcb3bfcbe1f77d70226d03e':
  [HW9] Pull the processed event further.
2014-07-31 13:40:43 +00:00
Jean Chalard b11f1477a1 am 214f7431: am 795711f5: am 69b68b59: Fix some unit tests.
* commit '214f74313135f1027dae0c7792b652ca1b9f4914':
  Fix some unit tests.
2014-07-31 13:40:36 +00:00
Jean Chalard dcd3d2187c am 0b9d6140: am 00ee5f76: [HW10] Pull the processed event in its eventual place
* commit '0b9d6140495b106458bf22d11f5732bf5a0062b0':
  [HW10] Pull the processed event in its eventual place
2014-07-31 13:35:34 +00:00
Jean Chalard 3d663a0a9d am 1711c2aa: am f290d407: [HW9] Pull the processed event further.
* commit '1711c2aaf495a56d570f25d1b853bc3f40f16d08':
  [HW9] Pull the processed event further.
2014-07-31 13:35:33 +00:00
Jean Chalard 214f743131 am 795711f5: am 69b68b59: Fix some unit tests.
* commit '795711f5f91001416c0aab38203c3aa7a9bc9f98':
  Fix some unit tests.
2014-07-31 13:35:18 +00:00
Jean Chalard da5ccd9f18 [HW11] Cleanup
Change-Id: Ia866d3f9a5981c687766f8c39979fb6091018e44
2014-07-31 18:33:30 +09:00
Jean Chalard 00ee5f7697 [HW10] Pull the processed event in its eventual place
Change-Id: I5f7932097627766e907764a99a5e9c170f725bc0
2014-07-31 09:10:24 +00:00
Jean Chalard f290d4073a [HW9] Pull the processed event further.
The 'processedEvent' variables will ultimately disappear entirely.

Change-Id: I612c5ce7dedc341b64921a86ac028fe91b75359b
2014-07-31 09:10:03 +00:00
Jean Chalard 69b68b5916 Fix some unit tests.
The default value for the script needs to be Latin, as we don't specify
it in the files.

Change-Id: I1275f13f1cd92f00dc5708748fefb4982f0a60b3
2014-07-31 12:29:35 +09:00
Geoff Mendal 77aa7a9293 Merge "Import translations. DO NOT MERGE" 2014-07-30 19:31:16 +00:00
Geoff Mendal 09c66a64f0 Import translations. DO NOT MERGE
Change-Id: I3d29195219313870f9213eeaf0b985dfd350b73f
Auto-generated-cl: translation import
2014-07-31 00:12:44 -07:00
Geoff Mendal 71864e2edc Merge "Import translations. DO NOT MERGE" 2014-07-30 19:31:16 +00:00
Geoff Mendal 5720e29cdd Import translations. DO NOT MERGE
Change-Id: If072b73a0d9b75abd607b36437fbca00334e3676
Auto-generated-cl: translation import
2014-07-31 00:08:16 -07:00
Geoff Mendal 95284392fa Merge "Import translations. DO NOT MERGE" 2014-07-30 23:34:26 +00:00