Commit Graph

2996 Commits (fdb889cb43444a171bf71c2deaf00033b8a14949)

Author SHA1 Message Date
Jean Chalard fac678e13d Merge "Create the path for specifying combining rules in the subtype" 2014-05-12 09:33:27 +00:00
Tadashi G. Takaoka 722f5c7966 Remove voice key from keyboard layout
Bug: 14419121
Change-Id: I71031f1ed9735a5a05dc584299b56512fb0b6866
2014-05-12 17:07:01 +09:00
Jean Chalard be99616afa Create the path for specifying combining rules in the subtype
Also add the skeleton of the combining rules for Myanmar
reordering as a pilot.

Bug: 13945569
Change-Id: Iabeb6838f45f1efff482143595ce5b48543e0c43
2014-05-12 15:58:51 +09:00
Tadashi G. Takaoka c41d261b7e Add voice key to suggestions strip
Bug: 14419121
Change-Id: I3b2bdc3c07bb7e49ea7be53649bd6dd134fea27c
2014-05-12 15:08:14 +09:00
Tadashi G. Takaoka d5e3f02586 Add pseudo LMP theme
This CL introduce pseudo LMP theme. This keyboard theme is a
placeholder and not final. The drawables and colors that this CL
introduces should be replaced with the final assets.

Bug: 14419121
Change-Id: I7a37c884e4ee0cac09ad21ff729996c2b9c1b4af
2014-05-12 11:52:41 +09:00
Tadashi G. Takaoka 59c3ef1ff8 Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Id7b3ddd8aa.

Change-Id: I2d55602d026e30b38d8f822d2124f5c5e4a9a812
2014-05-12 10:59:10 +09:00
Ken Wakasa d47dca429e Revert "Refactor KeyboardTheme"
This reverts commit 19688b584b.

Build breakage.

Change-Id: I95d4be1578824eaee5a2fb08ec277250727ac668
2014-05-09 11:28:19 +00:00
Tadashi G. Takaoka 19688b584b Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Ifcedeabbec.

Change-Id: Ibe75146e2c1c7eebf964ca86550baf244fedb79a
2014-05-09 16:21:02 +09:00
Baligh Uddin 1a180c155d Merge "Import translations. DO NOT MERGE" 2014-05-08 15:29:35 +00:00
Baligh Uddin 650023991d Import translations. DO NOT MERGE
Change-Id: I7fab17fff5b54a5c409ac5c469db00dc95d1fb7a
Auto-generated-cl: translation import
2014-05-07 21:40:21 -07:00
Tadashi G. Takaoka 2b479cccae Use margin instead of padding in SuggestionStripView
This CL also tunes the width of suggestions strip to be able to
display 15~16 letters without x-scaling at the center slot.

Bug: 14419121
Change-Id: Ia5766cee043899533e24e2ebc621e8dc279370b3
2014-05-07 19:12:28 +09:00
Tadashi G. Takaoka 9d99a2edee Make KeyboardView style as a parent of SuggestionStripView style
With this CL, SuggestionStripView can refer an icon asset in a
keyboard theme.

Bug: 14419121
Change-Id: I30d595c08ce02b8c7d3f111e1edab2820c0b602e
2014-05-07 12:13:02 +09:00
Baligh Uddin 04348c3637 Merge "Import translations. DO NOT MERGE" 2014-05-06 15:16:24 +00:00
Baligh Uddin b313db1f50 Import translations. DO NOT MERGE
Change-Id: I507926af8d82abc3ef14e99dde443e6d3068a848
Auto-generated-cl: translation import
2014-05-05 16:49:21 -07:00
Baligh Uddin ee568ee746 Import translations. DO NOT MERGE
Change-Id: I597ed10762a3c2e79e77ef21ef8d7bac4ee7488b
Auto-generated-cl: translation import
2014-05-05 16:48:49 -07:00
Tadashi G. Takaoka 920188c238 Merge "More meaningful Emoji descriptions" 2014-05-02 01:20:22 +00:00
Tadashi G. Takaoka 71c96c079f Merge "Add Marathi keyboard layout" 2014-05-02 01:20:07 +00:00
Baligh Uddin 9287f2a26f Merge "Import translations. DO NOT MERGE" 2014-05-01 16:47:26 +00:00
Tadashi G. Takaoka a5ab5d830c Add Marathi keyboard layout
Bug: 10028772
Change-Id: I7bca05bbbfdb2e5f61d5db611dff62ace3b71e31
2014-05-01 18:25:56 +09:00
Tadashi G. Takaoka 2035cec9bc More meaningful Emoji descriptions
Bug: 11452158
Change-Id: I3e7c2c935bc7c371869240487928160d5ab850e2
2014-05-01 18:16:51 +09:00
Tadashi G. Takaoka d6d2a41be9 Merge "Add TalkBack spoken description of Emoji letters" 2014-05-01 08:37:25 +00:00
Jean Chalard bedef0b4f0 Merge "Introduce clustering punctuation" 2014-05-01 07:01:04 +00:00
Jean Chalard 29c00ff538 Introduce clustering punctuation
Bug: 10081730
Change-Id: If198fa3df68ecb267da0a278da41fd509d6165f1
2014-05-01 15:45:24 +09:00
Baligh Uddin 4f863d5598 Import translations. DO NOT MERGE
Change-Id: I8f524bebe216fea77f76db1646cb3b202c6b1e19
Auto-generated-cl: translation import
2014-04-30 16:17:14 -07:00
Tadashi G. Takaoka 24536580bf TalkBack correct shift state
Change-Id: I3097805c6c8b4a4ac19fbe062f763e2639eb5cbf
2014-04-30 18:46:46 +09:00
Tadashi G. Takaoka 7203239b88 Add TalkBack spoken description of Emoji letters
This CL imports the official code point name from Unicode standard
6.3.0.

Bug: 11452158
Change-Id: I23f9c26420c7e26dc73d2d076bfa6ec646361b06
2014-04-30 17:21:21 +09:00
Baligh Uddin e22398e31f Import translations. DO NOT MERGE
Change-Id: I102607cef8e2a42fad8a0f691c007d39b0be5622
Auto-generated-cl: translation import
2014-04-28 15:04:31 -07:00
Tadashi G. Takaoka a3920c7e6a Move some advanced settings to debug settings
This CL moves "Show slide indicator" and "Key long press delay"
advanced options to the debug settings.

Bug: 11866784
Change-Id: Iec16e09ba6e7c9f82ce0fa73a0d75766b843b44b
2014-04-25 12:03:47 -07:00
Baligh Uddin 2d1e4a907e Import translations. DO NOT MERGE
Change-Id: I68b045ca178ded1daa16595f88ef9b71c7a07278
Auto-generated-cl: translation import
2014-04-23 17:39:29 -07:00
Baligh Uddin 2e256aab41 Import translations. DO NOT MERGE
Change-Id: I8f219d738760632867c3f5622d12da281bdc66ef
Auto-generated-cl: translation import
2014-04-21 16:51:00 -07:00
Baligh Uddin 7cb0cc1b29 Merge "Import translations. DO NOT MERGE" 2014-04-17 16:23:49 +00:00
Tadashi G. Takaoka bfc998096b Add contentDescription to Emoji palette
This CL adds content descriptions of:
- Emoji Category icon/label.
- Delete key
- Space key

Bug: 11452158
Change-Id: Ic00592c560b6265c880cd25f2e18cfd349b4620b
2014-04-17 17:43:34 +09:00
Tadashi G. Takaoka 1c1d37caf9 Separate TalkBack description resources
Change-Id: Ib57c0e2faa67119b1c3a9bcf311828d71c2965d6
2014-04-17 12:58:14 +09:00
Baligh Uddin f8a1c9ee68 Import translations. DO NOT MERGE
Change-Id: Id7b70a9f7798ba067ac95a7be47f7dadcb34924a
Auto-generated-cl: translation import
2014-04-16 20:32:29 -07:00
Tadashi G. Takaoka c3a19a5249 Remove GingerBread keyboard theme
This CL must be checked in together with I6a9ac172a5.

Bug: 14042743
Change-Id: Ic3f01f5d10097d743325df847bd7cd2959992487
2014-04-14 19:05:21 +09:00
Tadashi G. Takaoka 21eafd7910 Use KeyboardTheme id insteand of index
This CL must be checked in together with I771216f8bd.

Bug: 14042743
Change-Id: I45c3acf9242985fb03721a9a6d377fbccc8e2019
2014-04-14 18:59:54 +09:00
Tadashi G. Takaoka 977d052f8c Revise myanmar keyboard layout
Note that this keyboard layout is still a preliminary.

Bug: 7963632
Change-Id: I4c53b3359ea2c0dd8e2ce7db8ec916ab9340eec5
2014-04-11 15:29:30 +09:00
Baligh Uddin 4ba064b7e1 Merge "Import translations. DO NOT MERGE" 2014-04-10 16:00:42 +00:00
Tadashi G. Takaoka 58e830ec19 Refactor SubtypeLocaleUtils a bit
Change-Id: If8b7fd5ef0b4ff3791deeacc12abb256a10176bf
2014-04-10 17:24:58 +09:00
Tadashi G. Takaoka 0ce38865d7 Merge "Reorder Greek accented vowels" 2014-04-10 06:25:25 +00:00
Tadashi G. Takaoka d1cc4e0beb Reorder Greek accented vowels
Bug: 13941339
Change-Id: I501e69d8f28526e3791ee8a338345926ff1b9a4c
2014-04-10 15:20:17 +09:00
Tadashi G. Takaoka ac5e6ddd97 Add Italian (Switzerland) it_CH layout
Bug: 13920900
Change-Id: I57df8ca12b0d8cc4bbca2372c0470dcae5b5cbfb
2014-04-10 11:56:44 +09:00
Baligh Uddin 7c18135db8 Import translations. DO NOT MERGE
Change-Id: I2b2e88ffcfa3690c7b4c0b0a64eda13e2a9c9f75
Auto-generated-cl: translation import
2014-04-09 16:19:55 -07:00
Tadashi G. Takaoka 9a924d7b00 Add Spanish (Latin America) subtype (es_419)
Bug: 7531804
Change-Id: I183443779f8d9d472ac5e528e1d905366bd83c90
2014-04-09 19:09:17 +09:00
Tadashi G. Takaoka daf75d275e Add en_IN subtype
Bug: 13914988
Change-Id: Ifd497a6a1d2686490e388e10e391475e97e9c166
2014-04-09 12:48:43 +09:00
Tadashi G. Takaoka 1b1732be5b Merge "Use Quantum.Light theme for API 20 or later" 2014-04-08 03:24:28 +00:00
Tadashi G. Takaoka f1f2979994 Merge "Add "preliminary" comment to hindi_compact subtype" 2014-04-08 02:35:15 +00:00
Tadashi G. Takaoka aff1fcb43f Add "preliminary" comment to hindi_compact subtype
Hindi (Compact) input should be marked as "preliminary" until a
combining input logic for that subtype is implemented.

Bug: 13779052
Change-Id: Iae5be2cc24507d7533ca1dd56b18cd80818a8cf1
2014-04-08 11:32:37 +09:00
Tadashi G. Takaoka a1df9ef753 Use Quantum.Light theme for API 20 or later
Bug: 13698528
Change-Id: Ibf03b3eedbd07e986d7d206bfd3803108dbbe6d5
2014-04-08 11:23:47 +09:00
Baligh Uddin 4a43b49355 Import translations. DO NOT MERGE
Change-Id: Idd39b817c682589b998fb5955f65f7bce8843058
Auto-generated-cl: translation import
2014-04-07 15:35:08 -07:00
Tadashi G. Takaoka b6c70f4ed3 Remove unneeded CustomViewPager class
Originally this hacky class has been introduced by I0824f82c30 to
address bug: 11721001.  Because the bug: 11721001 has been addressed
by I950f13ec40 and etc., this class should be removed.

Bug: 13665882
Change-Id: Iabdd369e4dddb0188534289eea1269fb196895eb
2014-04-07 12:41:51 +09:00
Baligh Uddin a179f0a33f Merge "Import translations. DO NOT MERGE" 2014-04-04 14:45:23 +00:00
Tadashi G. Takaoka 9b46ddc1d5 Use platform default theme for activities and dialogs
Bug: 13698528
Change-Id: Ib904c911452525e3749c0eb287434b504576db5f
2014-04-04 17:13:54 +09:00
Tadashi G. Takaoka a3804e5e10 Add hindi_compact keyboard
Bug: 13779052
Change-Id: Ic7c17d96560501422a63340d7ce6bd8720e6c3c9
2014-04-03 19:47:31 +09:00
Tadashi G. Takaoka 303f440311 Refactor Devanagari key-styles
Change-Id: I799b04317d5b7daff4bb230294b2de474e5585eb
2014-04-03 17:59:29 +09:00
Tadashi G. Takaoka b9964b5fe2 Rename string resource to more generic name
Change-Id: I0a3386e921f3027114126ca4c8e09f41288d2d7c
2014-04-03 13:18:31 +09:00
Baligh Uddin cc2056bb02 Import translations. DO NOT MERGE
Change-Id: I9d6b10255127cf5fd0536a0f6c27e64db7b7c20d
Auto-generated-cl: translation import
2014-04-02 15:24:51 -07:00
Baligh Uddin 2f781026cc Merge "Import translations. DO NOT MERGE" 2014-03-27 21:56:22 +00:00
Tadashi G. Takaoka 94f111f881 Remove "sRGB IEC61966-2.1" profile to supress libpng warning
The above ICC profile causes the following libpng warnings while APK
packaging.

* libpng warning: iCCP: known incorrect sRGB profile
* libpng warning: iCCP: profile 'icc': 'RGB ': RGB color space not
  permitted on grayscale PNG

Bug: 11869853
Change-Id: Ida296d9e3bbd2abaae7c7500d77c8dc54d8b2382
2014-03-27 11:37:52 +09:00
Baligh Uddin a0ea344cc7 Import translations. DO NOT MERGE
Change-Id: Ia5b2ec8549346f3b4b1c2ffd569abde6cdecae3e
Auto-generated-cl: translation import
2014-03-26 17:32:17 -07:00
Tadashi G. Takaoka 317075e00d Merge "Suppress warnings related to string resource" 2014-03-26 10:12:52 +00:00
Tadashi G. Takaoka c4b558d375 Merge "Rename text resources consistently" 2014-03-26 10:06:34 +00:00
Tadashi G. Takaoka a95e306d7f Suppress warnings related to string resource
Change-Id: I03073981313ae4f10a12b32ed9f524d0d50c2aa7
2014-03-26 19:05:29 +09:00
Baligh Uddin f6422f0695 Merge "Import translations. DO NOT MERGE" 2014-03-25 20:42:42 +00:00
Tadashi G. Takaoka 393efd94e5 Rename text resources consistently
- keylabel_<key>, the key label text of the <key>
- keyspec_<key>, the key specification of the <key>
- keyhintlabel_<key>, the hint label text of the <key>
- morekeys_<key>, the more keys specifications of the <key>
- additional_morekeys_<key>, the additional more keys specification of
  the <key>

Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
2014-03-25 13:02:09 +09:00
Tadashi G. Takaoka 37b9562fd7 Fix talk back of emoji key
Bug: 13629734
Change-Id: Ifff6f81c2ac99a32855cd333b3d9a01ad7155ffc
2014-03-25 11:58:59 +09:00
Baligh Uddin ea091b31a1 Import translations. DO NOT MERGE
Change-Id: If1481b48b8c94b80932584893c29d9218f3c3ebd
Auto-generated-cl: translation import
2014-03-24 16:32:00 -07:00
Tadashi G. Takaoka a13096db38 Merge "Fix PC Qwerty shift locked layout" 2014-03-20 09:39:42 +00:00
Tadashi G. Takaoka 44f144ab3a Remove reference of KeyboardTextsSet from SpacingAndPunctuations
Change-Id: I76a8fcbd2466bcaf9cd85501af270db5aa913999
2014-03-20 17:14:43 +09:00
Tadashi G. Takaoka 270bd39af4 Remove Latin comma from Arabic/Persian keyboard
Bug: 12807701
Change-Id: Icca63586d561a57b2c15cbfbae0de98dfcc137a3
2014-03-20 11:45:53 +09:00
Tadashi G. Takaoka 1aac375809 Add clarification to be able to use abbreviation
Bug: 13002703
Change-Id: I472ff9c2d3517b0c650e1f96eaacfa04a164637d
2014-03-19 12:26:44 +00:00
Tadashi G. Takaoka a49be9b112 Fix PC Qwerty shift locked layout
Bug: 13537661
Change-Id: I5b3645a64126118e22f44c262123076e85d7f83e
2014-03-19 20:35:15 +09:00
Tadashi G. Takaoka f0229934fc Merge "Add Galician keyboard" 2014-03-19 10:43:49 +00:00
Tadashi G. Takaoka 1820667642 Merge "Add Basque keyboard" 2014-03-19 10:43:37 +00:00
Tadashi G. Takaoka 110e9f9e88 Add Galician keyboard
Bug: 13169021
Bug: 13017434
Change-Id: I5d44dc4c2387644028a5cf594954795e014f357a
2014-03-19 19:41:18 +09:00
Tadashi G. Takaoka 0c797e8867 Add Basque keyboard
Bug: 13169021
Bug: 13017434
Change-Id: I46c738e833a9f287586a03bda9ab0230f8b9eac1
2014-03-19 19:40:34 +09:00
Tadashi G. Takaoka bdd79917f0 Fix PC Qwerty layout
This CL fixes:
 - Action label never displayed on phone.
 - Go action label incorrectly showed on tablet.
 - Broken layout on noMicrophoneKey+noSettingsKey input field.
 - "Voice input key" settings has no effect on phone.
 - Inconsistent microphone and emoji key layouts.
 - Slightly modified spacebar size when language switch key is on.
 - Slightly larger enter key on tablet.

Bug: 13537661
Change-Id: I69a6ee7bc99e84b104a4d0352e1824096f6a4750
2014-03-19 19:37:27 +09:00
Tadashi G. Takaoka 6674449ac2 Remove duplcaited plus-minus symbol on PC Qwerty
Bug: 13537661
Change-Id: I18c5accb6af7faaf81f71f861b924ba87838fdbc
2014-03-19 17:02:23 +09:00
Tadashi G. Takaoka 505d3247bb Fix Colemak layout
Bug: 13535305
Change-Id: I48c42d4cdc5e991873cbdd1eb8abe5428b850dcf
2014-03-19 11:46:29 +09:00
Tadashi G. Takaoka 6bdb2e60dc Merge "Add preliminary Myanmar keyboard" 2014-03-18 05:53:51 +00:00
Tadashi G. Takaoka fc3263a75c Add preliminary Myanmar keyboard
This CL adds preliminary Myanmar keyboard as a groundwork. The
keyboard layout comes mainly from virtual keyboard of
<http://www.google.com.mm/>

Bug: 7963632
Change-Id: I36504ceb6c2079a6e133edaeb458da1c5cf3ded2
2014-03-18 10:28:57 +09:00
Geoff Mendal c9498827f6 Import translations. DO NOT MERGE
Change-Id: I712637a751e4d27cc1a5ce4c917918f0542c396d
Auto-generated-cl: translation import
2014-03-17 16:58:10 -07:00
Tadashi G. Takaoka d22bd20b36 Fix comments in XML files
Change-Id: Id0a69f98297d6a827006c6c4fe1304a197381f82
2014-03-17 12:45:39 +09:00
Tadashi G. Takaoka 2ba410850b Fix space key on tablet symbols/symbols shifted
This is a follow up of Ic175c5d792.

Bug: 13460706
Change-Id: I7d0121855a029a5006c78d53b630fedc8f57110c
2014-03-14 14:28:59 +09:00
Tadashi G. Takaoka 1f69164f06 Merge "Fix ZWJ/ZWNJ on Nepali tablet keyboards" 2014-03-14 01:54:49 +00:00
Tadashi G. Takaoka 1912609a9e Add qwerty keyboard layout tests
This CL adds Afrikaans, Azerbaijani (AZ), Dutch, English (UK), French
(CA), German (QWERTY), Icelandic, Indonesian, Italian, Latvian,
Lithuanian, Malay (NY), Polish, Portuguese (BR/PT), Romanian, Slovak,
Slovenian, Swahili, Turkish, Vietnamese, Zulu, and No Language
keyboards tests.

Bug: 13017434
Change-Id: I2343dc8e74172ac551ef86f82453ae796b6f19dc
2014-03-14 10:42:27 +09:00
Tadashi G. Takaoka e49bc0f521 Fix ZWJ/ZWNJ on Nepali tablet keyboards
Bug: 13460706
Change-Id: Ic175c5d7920ed56a007374160be6ed76b44c4f94
2014-03-14 10:20:27 +09:00
Tadashi G. Takaoka 709acaa9e9 Fix Greek tablet layout aligned with phone layout
Bug: 13406008
Change-Id: Iba5bd757c5874e426d5d4fcb8c404c21d259b833
2014-03-11 17:23:01 +09:00
Ken Wakasa 783aee47e0 Remove string-arrays that are getting in the way
These empty string-arrays should not have been in this resource file.
They are in the translated files, and they are getting in the way of
the resource finding paths.

Fundamental fixes definitely should follow. For now, this CL should be
safe and acceptable for Cannellini.

bug: 13340486
Change-Id: I14c36babf9eb30cfc1c0adc5977136189a305f33
2014-03-08 22:37:27 +09:00
Tadashi G. Takaoka a4fe6a8dba Fix AZERTY/tablet layout
Bug: 13351429
Change-Id: I599627a78397e5bbae689c1aec3a3f11b72a834f
2014-03-07 14:29:30 +09:00
Baligh Uddin 1df1f56ec5 Merge "Import translations. DO NOT MERGE" 2014-03-06 21:14:52 +00:00
Tadashi G. Takaoka dbe531efa8 Merge "Remove unused text resource keylabel_for_east_slavic_row1_12" 2014-03-06 02:47:06 +00:00
Baligh Uddin 0b3f8935b5 Import translations. DO NOT MERGE
Change-Id: I7a730021b1c38c8ef7aa62b567a68a7cc478e516
Auto-generated-cl: translation import
2014-03-05 17:17:49 -08:00
Tadashi G. Takaoka 4309b83ea9 Remove unused text resource keylabel_for_east_slavic_row1_12
The text resource used in 10 inch tablet layout.

This change also corrects {keylabel|more_keys}_for_east_slavic_row2_1
to _row2_2.

Change-Id: I60d69af22f97c008449b8dccc7c84ae6a05fe0d8
2014-03-04 17:12:31 +09:00
Baligh Uddin 44c7ffb697 Import translations. DO NOT MERGE
Change-Id: I43912170c269379a86d2ae98efb2198f374a25aa
Auto-generated-cl: translation import
2014-03-03 16:40:23 -08:00
Keisuke Kuroyanagi e76c273502 Merge changes I20ce61c4,I2edab4e3
* changes:
  Remove "Use only personalization dictionary".
  Remove redundant creation of dictionary facilitator.
2014-03-03 04:00:24 +00:00
Keisuke Kuroyanagi 1aac28a2b9 Remove "Use only personalization dictionary".
Bug: 13216198
Change-Id: I20ce61c4a10c360e028bf6427f632cc5299763e4
2014-02-27 22:32:00 +09:00
Baligh Uddin 8c1e3280f9 Merge "Import translations. DO NOT MERGE" 2014-02-27 05:12:01 +00:00
Baligh Uddin 71df6eb3e1 Import translations. DO NOT MERGE
Change-Id: I8b9aff5dbd685c004ee95110a9b07370e6108c4f
Auto-generated-cl: translation import
2014-02-26 15:59:55 -08:00
Baligh Uddin c58ead6425 Import translations. DO NOT MERGE
Change-Id: Ife378b455d381a98fb998e0348a54b9637db95a9
Auto-generated-cl: translation import
2014-02-26 15:56:22 -08:00