Commit Graph

3279 Commits (aaddee7010f57e8e7785badddb9880b3cc99ebc4)

Author SHA1 Message Date
Tadashi G. Takaoka 2637be27c5 Support Accept typed word UI
Change-Id: I58e95b2791a45afdc7dae8e26dcfc200b3b4b854
2014-08-22 21:25:35 +09:00
Yohei Yukawa 907825548b Use FrameLayout for the backing view
If we render our UI around the composing text in the fullscreen
mode, probably we need to have our views under
android.R.id.extractArea, which is implemented as FrameLayout.
Therefore, using FrameLayout for the backing view makes it easy
to simplify the code between normal mode and full screen mode.

Change-Id: I69533b22d9d1368ad906dc5ef7be1a1b674d10b8
2014-08-19 14:04:35 +09:00
Yohei Yukawa 1a1c5e0f60 Use RelativeLayout for the backing view
RelativeLayout allows the IME to place its UI element at an
arbitrary position on the backing view.

Change-Id: Ib40d2111f56d8f38007e37c6c47536db3f0bef75
2014-08-16 12:34:01 +09:00
Tadashi G. Takaoka a94c89e017 Use light emoji icon for Material light tablet keyboard
Bug: 16808603
Change-Id: I39ce0ed8b5580754dfd0cf1494289b0a23863d50
2014-08-14 00:25:34 +09:00
Tadashi G. Takaoka c225d2e29c Add setting boolean for showing UI to accept typed word
Change-Id: Iedd90d07b904362d9debc9994ce86cd78a0303b9
2014-08-13 17:29:49 +09:00
Tadashi G. Takaoka a696c92477 (DO NOT MERGE) Add debug setting to force hardware special key
Bug: 13988700
Change-Id: If23f8a14097431e76a303a6d6c24e8d9835fb655
(cherry picked from commit 3659c70fc3)
2014-08-13 08:04:54 +00:00
Tadashi G. Takaoka c9add10c38 (DO NOT MERGE) Disable Sinhala keyboard for L-release
This CL also disables Tamil (Sri Lanka) subtype in conjunction with
Sinhala (Sri Lanka) subtype.

Bug: 6911143
Bug: 9978106
Change-Id: I686b4e5d2c79039ca8d837d3227448d69c7e47de
2014-08-11 11:14:07 +00:00
Tadashi G. Takaoka 25906373ff Fix Tamil keyboard
This CL adds Tamil (Sri Lanka) and Tamil (Singapore) subtypes.
This CL also fixes Sinhala Keyboard's currency symbol.

Bug: 9978106
Bug: 6911143
Change-Id: I2060978097882d0f4b1ec10f1103260ed8a447d0
2014-08-11 18:07:27 +09:00
Tadashi G. Takaoka 2863997abd Fix Kannada keyboard
Bug: 10029252
Change-Id: I5ae056ca6ada4ffb921e9882bf57ad21a9bb4d47
2014-08-11 15:51:56 +09:00
Tadashi G. Takaoka 015fcc2685 (DO NOT MERGE) Enable InScript keyboards for L
This CL enables the followin InScript keyboards for L-release.
- Sinhala
- Tamil
- Bengali
- Telugu
- Marathi
- Kannada
- Malayalam

Bug: 6911143
Bug: 9978106
Bug: 10028755
Bug: 10028759
Bug: 10028772
Bug: 10029252
Bug: 10417006
Change-Id: Id8962b429fbb58b5c2c90a65849af6a6fe84a8c9
2014-08-11 15:51:12 +09:00
Ken Wakasa 31869bf5ad A follow up to AAPT change
AAPT previously allowed apps to generate resources in the android
package. This is no longer allowed after I1be66e3f8df9a737b21c71f8a93685376c7e6780.

Change-Id: Icda68829c0bf9254b6637f0ec2cecc0b357dbc43
2014-08-10 11:21:14 +09:00
Ken Wakasa 83a96fe5c7 Initial implementation of Help & feedback
bug: 16717930

Change-Id: Iddc8e831c3f01ec7eb02ed1bc5d5e103d497e177
2014-08-08 12:58:31 +09:00
Tadashi G. Takaoka db776143d9 Revert "Revert "Align hint label to bottom""
This reverts commit 02c4a80afe.
2014-08-07 23:44:34 +09:00
Tadashi G. Takaoka dfeb014726 Revert "Revert "Tune number letter size of Material keyboard""
This reverts commit 5ad718f2ca.
2014-08-07 23:43:37 +09:00
Tadashi G. Takaoka f7f6574368 Revert "Revert "Remove unused Key and Keyboard attributes""
This reverts commit 44e20f4fb4.

Change-Id: I6560c8f4ef15bf8318d9eedf68a9eb5031f0581d
2014-08-07 23:36:57 +09:00
Tadashi G. Takaoka e9ed396f6c Merge "Revert "Revert "Add Key label off center attribute""" into lmp-dev 2014-08-05 00:03:09 +00:00
Tadashi G. Takaoka 0b5d12c6b4 Revert "Revert "Add Key label off center attribute""
This reverts commit 787e9a37b4.

Change-Id: I177b8f5d08eb487c19180c09101cc073222c4efe
2014-08-07 14:31:47 +00:00
Ken Wakasa 787e9a37b4 Revert "Add Key label off center attribute"
This reverts commit ba49920e80.

Due to unit test breakage.

Bug: 14419121
Change-Id: I6f4fc30b86227e59c883d202551b162dc91b4166
2014-08-07 11:38:36 +00:00
Tadashi G. Takaoka 0df148fce0 Merge "Revert "Revert "Remove unused animation resources""" into lmp-dev 2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka 57914a138a Revert "Revert "Remove unused animation resources""
This reverts commit c083255b50.

Change-Id: I357bcafe7f28fe72b2b51b566dd59ac9c1c5b2fc
2014-08-07 14:27:57 +00:00
Tadashi G. Takaoka 6dcdfcc39d Clean up Keyboard and KeyboardView theme
Change-Id: I3f49f400b3857d34e1f2a7727a17c768787fe045
2014-08-07 23:17:01 +09:00
Ken Wakasa 414e9470d8 Revert "Clean up Keyboard and KeyboardView theme"
This reverts commit ef231984ed.

Due to unit test breakage.

Change-Id: I2136e950c3f72fb82b01e90758c1036bb0b7d508
2014-08-07 11:40:14 +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
Tadashi G. Takaoka 9e7f0677bf Remove unused animation resources
Change-Id: Idc0670588bb51e6a2b3eac9489cb643db293815a
2014-08-07 16:24:02 +09:00
Tadashi G. Takaoka e19c520b41 Align space key icon to bottom of a key
The Key.keyLabelFlags's flag "alignButtom" (misspelled) has been
removed by Iae3cd66744. This CL re-introduce the same flag with
"alignIconToBottom".

Bug: 16803172
Change-Id: I412590f394c6ca9b36358d6acfe8675071403bdd
2014-08-07 12:42:27 +09: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 91f47b03fe Merge "Remove unused animation resources" into lmp-dev 2014-08-05 00:07:36 +00: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 0f2de75e31 Merge "Revert "Remove unused animation resources"" into lmp-dev 2014-08-05 00:03:09 +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 017e9f7e7f Add dedicated background for custom action label key
Bug: 15526978
Change-Id: Ia73d825c7e00097018822704e61272d0e448f39a
2014-08-06 17:23:14 +09: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
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
Tadashi G. Takaoka 44454c2b2b Tune number letter size of Material keyboard
Bug: 14419121
Change-Id: I6a477b9bf9022e369d4a6a77415490dc2b9eefc6
2014-08-07 17:55:38 +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
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 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
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 ae4e203625 [SD13] Reorder an enum alphabetically
Change-Id: I907041b09e5bfce537ed4f592947b2cec8cef4ac
2014-07-30 15:58:43 +09:00
Jean Chalard 3a729d4ed8 [SD12] Add the last remaining scripts
Add scripts for Bengali, Devanagari, Kannada, Malayalam,
and Tamil.
Also include a very minor fix for Arabic.

This concludes work on:
Bug: 15840116

Change-Id: Iade313fc70030a67c68d424d8cb0cac245b883d1
2014-07-30 15:58:43 +09:00
Jean Chalard 7c5cd5ec89 [SD11] Add script checks for Myanmar, Sinhala, Thai and Telugu
Bug: 15840116
Change-Id: I1264fdeea0d4739ca0f360f4934d06e5a824d4e5
2014-07-30 15:58:43 +09:00
Jean Chalard a9c12692ed [SD10] Add script checks for Lao and Khmer
Bug: 15840116
Change-Id: Id72b739e73cb3e72f56e1872ad9d60469555e193
2014-07-30 12:02:37 +09:00
Tadashi G. Takaoka a715d7f6fd Use fragment for keyboard theme settings
Bug: 11866784
Change-Id: Ic50b6eb1bd8f2b823e2c9dfad04d8615bc910936
2014-07-29 18:19:20 +09:00
Jean Chalard 76ad259764 Merge "Improve the russian dictionary." into lmp-dev 2014-07-25 11:19:20 +00:00
Jean Chalard ae41058659 Improve the russian dictionary.
Deleted: 38 words
Probability adjusted: 11 words
Added: 1299 words

[Category diff]
+1      15
-1       0
+2       0
-2       0
+3       0
-3       0
+4       0
-4       0
+5       0
-5       3
+6       1
-6       0
+7       0
-7      13

[Weighted category diff]
+1      15
-1       0
+2       0
-2       0
+3       0
-3       0
+4       0
-4       0
+5       0
-5       3
+6       1
-6       0
+7       0
-7      13

Change-Id: I1a6513954d60b30738cb849578ce535c5e05eb1a
2014-07-29 13:31:23 +09:00
Tadashi G. Takaoka e14c680078 Update Material icons and backgrounds
Bug: 16143083
Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
2014-07-29 11:32:04 +09:00
Tadashi G. Takaoka 9bdcb13160 Use fragment for advanced preference screen
Bug: 16522808
Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
2014-07-28 19:24:41 +09:00
Tadashi G. Takaoka 99295c8c5f Refactor Debug settings to use SubScreenFragment
Bug: 16522808
Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
2014-07-28 19:16:42 +09:00
Tadashi G. Takaoka 00b49cad9c Use fragment for text correction preference screen
Bug: 16522808
Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
2014-07-28 17:48:49 +09:00
Tadashi G. Takaoka 3c8a075a58 Use fragment for gesture typing preference screen
Bug: 16522808
Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
2014-07-28 17:45:41 +09:00
Tadashi G. Takaoka 6b71530017 Use fragment for multi lingual preference screen
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
2014-07-28 17:20:16 +09:00
Tadashi G. Takaoka bfcd98edc7 Use fragment for input preference screen
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.

Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
2014-07-27 16:06:52 +09:00
Tadashi G. Takaoka ab661e3ef8 Make "Show correction suggestions" as a binary option
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.

Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
2014-07-27 14:47:07 +09:00
Tadashi G. Takaoka a270ac4a61 Remove unnecessary DebugSettingsActivity, use fragment directly
This CL must be checked in together with I1db2e848ab.

Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Baligh Uddin 8279b9d4a9 Remove deprecated locales - DO NOT MERGE
Change-Id: I8c1efe2343eea40faf7a690518c500af86c1c323
2014-07-20 02:27:29 +00:00
Tadashi G. Takaoka 34da749437 Merge "Update Hindi Compact keyboard layout" into lmp-dev 2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka 254c5c1e4b Update Hindi Compact keyboard layout
Bug: 13779052
Change-Id: I350e5521b41d2a0b1cc17b6d4a48e6a816db916c
2014-07-19 16:43:35 -07:00
Tadashi G. Takaoka 639c93f43b Remove unused Key.keyLabelFlags' values
Change-Id: Iae3cd6674448f258ee0a4bf2966bf3c347876b4f
2014-07-19 12:31:50 -07:00
Tadashi G. Takaoka de1ab73efb Use Theme.DeviceDefault theme
For API 21 (and later), Theme.DeviceDefault.Light is specified.

This CL must be checked in together with Ic91f28df81.

Bug: 11866784
Bug: 13888366
Bug: 15781377
Change-Id: I01b288473128fc2491d3663e90cab56d0ba2d704
2014-07-18 15:30:30 -07:00
Tadashi G. Takaoka 7f58115a86 Update Material theme colors
Bug: 15782668
Bug: 15436349
Change-Id: Idbf98933e60531dbddb9450c6dbe7c4e2492cbd5
2014-07-16 14:33:23 -07:00
Tadashi G. Takaoka 39ae9ee06b Mark Theme name text as translatable="false"
Bug: 16226064
Change-Id: Ice28fc20680889a4053c5d20c88dd744a0f7297e
2014-07-15 22:54:43 -07:00
Tadashi G. Takaoka ecfc6f347a Fix wrong shift key icon in Material Light theme
Bug: 16208129
Change-Id: I34ba531bcdd9b18b3b84c78cf0cd9cae439ecd5d
2014-07-12 13:39:17 +09:00
Tadashi G. Takaoka 63fc159550 Merge "Update Material theme colors" 2014-07-10 21:46:42 +00:00
Tadashi G. Takaoka 509d9be21f Update Material theme colors
This CL also fixes a bug of pressed state color of suggestions strip
in Material Light theme.

Bug: 16208167
Change-Id: I4315893bd129f65f34c863b003c8b2cfab4d2d84
2014-07-11 13:09:18 +09:00
Tadashi G. Takaoka b3bd025b1a Increase CHAR LIMIT of settings title
Bug: 16080988
Change-Id: I8638a26370bbe2abf5dfcd9f40200b57264f5c0b
2014-07-11 11:37:16 +09:00
Tadashi G. Takaoka 4607e763a4 Update Material icons and key pressed state background
Bug: 16143083
Bug: 15678940
Bug: 15680164
Change-Id: I9f2527a8a536aab05d961e619e3940603024385c
2014-07-10 22:40:06 +09:00
Tadashi G. Takaoka facfd28a47 Merge "Add some virama combinations and tall-a for Myanmar" 2014-07-09 17:22:29 +00:00
Tadashi G. Takaoka f9f409530c Add Material Light theme
Bug: 15782668
Change-Id: Id2ae47cfb2065d73f13701b9c6a041129dfd08ae
2014-07-10 07:43:04 +09:00
Tadashi G. Takaoka 46394af7b9 Update Material Dark theme
Bug: 15782668
Change-Id: If3f2439fe9dcd2c05514e73861777337b42273c4
2014-07-09 23:43:45 +09:00
Tadashi G. Takaoka b657c053c4 Add some virama combinations and tall-a for Myanmar
Bug: 7963632
Change-Id: I478ecdc3b7409ccd8dc729da28ad4816a2eda75e
2014-07-09 17:41:56 +09:00
Tadashi G. Takaoka d5f32b38f5 Add Telugu keyboard
Bug: 10028759
Change-Id: Id1bf030a9928124ead695aa7bf76db48ca58de4b
2014-07-09 02:36:15 +09:00
Tadashi G. Takaoka 03aa084ccd Add Kannada keyboard
Bug: 10029252
Change-Id: Ia03ff886f9e62a2fe228fe59b504b033eead7631
2014-07-09 01:44:04 +09:00
Tadashi G. Takaoka 59e795ca3f Add Malayalam keyboard
Bug: 10417006
Change-Id: Ieb03fe1f08c85417b5d9ad4d62c8a5bc6d0632bc
2014-07-08 23:42:01 +09:00
Tadashi G. Takaoka a315903fb1 Remove unnecessary autoXScale flag
Change-Id: I4385a53e9e8ec1e3902aafd4113d339ad7471b6f
2014-07-08 22:07:08 +09:00
Tadashi G. Takaoka 074e9812ee Merge "Add Tamil keyboard" 2014-07-02 19:52:36 +00:00
Tadashi G. Takaoka b5696b4f67 Add Tamil keyboard
Bug: 9978106
Change-Id: I226e640fe453076063121176121ed5923d1ccfa1
2014-07-08 18:05:07 +09:00
Tadashi G. Takaoka af2e0a5697 Update Bengali keyboard to add a few vowel signs
Bug: 10028755
Change-Id: Ia0b8624470c5b0667a3d7267d3cf8d4c937b0b0c
2014-07-08 18:29:56 +09:00
Tadashi G. Takaoka 9cb19b1bca Merge "Remove unused keyPreviewIcon attributes" 2014-07-02 21:09:42 +00:00
Tadashi G. Takaoka 6efe9ae1c0 Remove unused keyPreviewIcon attributes
This CL also removes unused tabKeyPreview icon.

Change-Id: Ia69ba9c3d7c67ccb8983275bed262292eb422db2
2014-07-08 17:36:11 +09:00
Baligh Uddin 34c7c7cc55 Merge "Import translations. DO NOT MERGE" 2014-07-07 17:47:39 +00:00
Baligh Uddin 344c12013c Import translations. DO NOT MERGE
Change-Id: I659b81a251775d27ef5f2d8c4b74f91c72af6370
Auto-generated-cl: translation import
2014-07-07 06:59:36 -07:00
Baligh Uddin 20d2e277b8 Merge "Import translations. DO NOT MERGE" 2014-07-06 02:28:07 +00:00
Baligh Uddin 388ddba649 Import translations. DO NOT MERGE
Change-Id: I9e4be44e89eac47733b39f5e46c10c6bf2611153
Auto-generated-cl: translation import
2014-07-07 07:04:12 -07:00
Tadashi G. Takaoka 0205fb220d Add Bengali keyboard layout
This is a preliminary keyboard layout.

Bug: 10028755
Change-Id: I365fb8e942a60d4b690a4af95fcd35bf73fffbe4
2014-07-04 20:59:37 +09:00
Keisuke Kuroyanagi b8a9479b57 Move phrase gesture from additional features to public.
Bug: 15758242
Change-Id: I703dc2703afdf9402c5d2ac27411b74ece993dba
2014-07-08 16:36:06 +09:00
Baligh Uddin c810480721 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:00:08 +00:00
Baligh Uddin 7a31afa277 Import translations. DO NOT MERGE
Change-Id: Ie4c06dda7d56da6248ec84abddb44d592e678e90
Auto-generated-cl: translation import
2014-07-07 06:43:07 -07:00
Baligh Uddin fd3cb59abb Merge "Import translations. DO NOT MERGE" 2014-07-02 20:00:08 +00:00
Baligh Uddin 08c29dfdce Import translations. DO NOT MERGE
Change-Id: I82c82756275887836f29c6bdc4f00504cf71e3a0
Auto-generated-cl: translation import
2014-07-07 06:45:33 -07:00
Baligh Uddin 3baa61cdd3 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin 1bf3dd898c Import translations. DO NOT MERGE
Change-Id: I2305910609685ccd29c71d73f96e47e484ec6847
Auto-generated-cl: translation import
2014-07-07 06:47:22 -07:00
Baligh Uddin 54f5f42720 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:11:01 +00:00
Baligh Uddin cde7ceb645 Import translations. DO NOT MERGE
Change-Id: Ifb6b83b1a84b4103193cf3e4fb84b0d52081e980
Auto-generated-cl: translation import
2014-07-07 06:49:51 -07:00
Baligh Uddin 9a98a4ce0d Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin 0d452c9406 Import translations. DO NOT MERGE
Change-Id: I5908c36d3c83f44e330a9f83240c4ecb91f96b48
Auto-generated-cl: translation import
2014-07-07 06:52:48 -07:00