Commit Graph

409 Commits (9dbd47b7c511a1a9eb8887eca88bb38bcee0e8df)

Author SHA1 Message Date
Akifumi Yoshimoto f4329f7fff Read dicttool option for switching code point table
Bug:17097992
Change-Id: I0b3f12c4450f784b9a33470d1dc4c306062de91e
2014-09-26 15:15:10 +09:00
Tadashi G. Takaoka aaefd56661 Add !string/<resource_name> reference
This CL introduces new text reference notation !string/<resource_name>
to refer a string resource on the fly.

This notation is mainly used to represent action key labels may refer
a string in a system locale in run-time.

This notation is needed to implement Hinglish and Serbian-Latin
keyboards that need to refer its own action key labels.

Bug: 17169632
Bug: 9687668
Change-Id: I042f6bd04714e0e448cd92031730eb9fb422e6d3
2014-09-25 18:27:23 +09:00
Tadashi G. Takaoka 8ea51a2760 Fix Turkish/Azerbaijani keyboard to add more accented letters
Bug: 16807005
Change-Id: Ifd0ab3aeb8207cdecacf8cfe5b1d58c07690142f
2014-09-22 10:55:08 +09:00
Tadashi G. Takaoka 90f06760b9 Fix Romanian keyboard to promote "A with breve"
Bug: 17324498
Change-Id: Ie27f0023b2bfb18b0ee2051260ecf6bab75727a5
2014-09-18 11:48:29 +09:00
Tadashi G. Takaoka d6696ae78b Add Hinglish (hi_ZZ) subtype
Bug: 17169632
Change-Id: Ibee088d76c2b19f1d62a3c9c119452726e856ec8
2014-08-21 19:12:25 +09:00
Ken Wakasa fb74ab15c1 Abolish source code overlay and inroduce overridable src dir
This should make IDEs happy with appropriate source code directory
selection.

bug: 16829244
Change-Id: Ic734bd4d20aa050c688a3158b1a382ae0ac18991
2014-08-16 03:37:54 +09:00
Tadashi G. Takaoka 1901c33128 am a94c89e0: Use light emoji icon for Material light tablet keyboard
* commit 'a94c89e017dac92e2c23dcf05a8e6b4000d021d3':
  Use light emoji icon for Material light tablet keyboard
2014-08-13 15:51:07 +00: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 aca5785a3d am 25906373: Fix Tamil keyboard
* commit '25906373ffe1b0e3e99b7412e9fd2a54f5d73345':
  Fix Tamil keyboard
2014-08-11 10:06:10 +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
Ken Wakasa ec8472b5f5 am 7f545a57: [HW7.5] Introduce the @Nonnull annotation (take 2)
* commit '7f545a57c987862d55966ac08ef64cfe0b9f51e4':
  [HW7.5] Introduce the @Nonnull annotation (take 2)
2014-07-30 16:58:00 +00:00
Jean Chalard 99e13e485a am bf2a3210: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit 'bf2a32100568a01d25edb56d3d9d46b5f5d2c0eb':
  [HW6] Split processing and applying the event.
2014-07-30 16:57:58 +00:00
Ken Wakasa 7f545a57c9 [HW7.5] Introduce the @Nonnull annotation (take 2)
Change-Id: I05512b5434810046c8b72d6bb41567b6cd8b9d6e
2014-07-30 04:13:58 +00:00
Ying Wang 0b2e2db919 am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
* commit 'ece7240c7ac09b1448998c202f991d0acd4bab01':
  Don't build dicttool unless it's explicitly requested.
2014-07-29 18:01:24 +00:00
Ying Wang ece7240c7a Don't build dicttool unless it's explicitly requested.
It easily breaks the checkbuild.

Change-Id: I43b35fade550ff9d64782ea43cb6e3a804424830
2014-07-29 10:46:38 -07:00
Tim Murray da9cc77339 resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Jean Chalard 7196566d4f [HW6] Split processing and applying the event.
...take 2

Change-Id: I9d13b6d51e13ce2e76ae3febebfb8c310eba509d
2014-07-30 11:06:43 +09:00
Tim Murray dd28478f5c Use default compiler flags for dicttool.
Not using this causes the triple to not be passed to clang, breaking Darwin.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-23 21:44:25 -07:00
Yohei Yukawa 6b14bbf125 Fix build breakage in dicttool
This CL fixes the build breakage caused by I0dd103185dcf62fb1e2505
due to the lack of android.text.Spanned in host environment.

BUG: 16029304
Change-Id: Ic966d10e8abe2c2be8d62c09d1502574535aa8b8
2014-07-20 12:46:34 +09:00
Tadashi G. Takaoka dc25f61e23 Fix dicttool build
This is a followup CL of Ic0268fd128.

Bug: 15318007
Change-Id: I3cd78d6db4030c558b9277ceaaf8ea76b9acdc66
2014-07-16 20:16:27 -07:00
Tadashi G. Takaoka 36713e5782 Fix alphabet label of Kannada and Telugu
Bug: 10029252
Bug: 10028759
Change-Id: Iea9cc1b7cafa97280503b0236b005cea57ba2c3d
2014-07-09 15:52:03 +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 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 68caceded4 Use bn-rIN resource directory for Bengali (India)
Bug: 10028755
Change-Id: I552ad3b30d359b79c48cde4912d796c532b42b51
2014-07-08 18:47:22 +09:00
Keisuke Kuroyanagi 3b8f2ece40 Merge "Move phrase gesture from additional features to public." 2014-07-02 20:35:42 +00: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
Tadashi G. Takaoka 1c9e9ecdfb Fix Armenian comma on phone device
Bug: 7963631
Change-Id: Ia28b4020652174daa2731b3eed7636db9639c6b6
2014-07-08 15:40:06 +09: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
Tadashi G. Takaoka 00da6ee5e8 Add Sinhala keyboard layout
Bug: 6911143
Change-Id: I9ff87ece3e68381c0e9855106e7320c227f09965
2014-06-27 16:16:30 +09:00
Tadashi G. Takaoka fec4769e0b Refactor dicttool with try-with-resource
This CL must be checked in together with Idd7c744d0f.

Change-Id: Ia0ff09a054c1852b39cdce22a4377108afb254e2
2014-06-22 23:20:37 -07:00
Ken Wakasa 54360424a1 Dicttool's shared lib is now built for 64bit
Change-Id: I3a21384e8ee6b419088f8140ff56a4ee89c3b052
2014-06-16 14:48:55 +09:00
Ying Wang c49c9c52be resolved conflicts for merge of 90b948ea to master
Change-Id: Ic86260b4e49ebda2ee718eadf0109ad9626a68e6
2014-06-11 12:28:56 -07:00
Ying Wang fb57fe263c Use LOCAL_MULTILIB to build host lib as 64-bit
Also we should use LOCAL_REQUIRED_MODULES instead of
LOCAL_ADDITIONAL_DEPENDENCIES.

Bug: 13751317
Change-Id: I742ff14b3de168e14e646749cf4f6bc9c9e7bc62
2014-06-09 12:16:30 -07:00
Tadashi G. Takaoka dc62c711aa Reorder keys around the spacebar
This CL reorders keys around the spacebar.
- On phone's symbols and symbols shift layout, the comma key is moved
  to the left of the spacebar to aligned with main layout.
- On tablet's layout, the comma key is moved to the left of the
  spacebar on all layout to aligned with the same layout of
  phone's. Also the comma key has "settings" as more keys.
- In Arabic and Perisan, the comma key of tablet already has some more keys
  This CL remove "/" and add "settings" instead.

Bug: 15281451
Change-Id: I6e0e75e4d4abfb1f356e7499be91424c7c57c58b
2014-06-04 00:45:25 +09:00
Jean Chalard 99ac090738 Fix the build.
Change-Id: Ie1cdc5642d8b6f63dbf71603b993f36b5c5f923c
2014-05-29 21:51:49 +09:00
Tadashi G. Takaoka 99258cb0b2 Warn that dicttool_aosp isn't supported on Darwin
Change-Id: I56def43213e94e5b1267e8e900c2192f4b0c2cb5
2014-05-24 03:08:57 +09:00
Tadashi G. Takaoka a91561aa58 Use Java 7 diamond operator
Change-Id: If16ef50ae73147594615d0f49d6a22621eaf1aef
2014-05-24 01:05:42 +09:00
Jean Chalard 7086d88d3e Have dicttool test tidy up after itself.
Bug: 13776363
Change-Id: Icb1d3fc0efe71e0339b434928e8aed507f2fb590
2014-05-23 19:56:57 +09:00
Keisuke Kuroyanagi 83c40a2301 Use PrevWordsInfo instead of String in Java side.
Bug: 14119293
Bug: 14425059

Change-Id: I3d5da84881a49a04550180dd9aac2c37da2ed762
2014-05-19 13:55:40 +09:00
Jean Chalard 5ce39dfa78 Fix a bug where changing languages kills the composition.
Bug: 14926896
Change-Id: Id2a06c68a51f833db4d8bbc858a232c2696afb6e
2014-05-14 20:34:32 +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 ebac0aa28f Reorder accented letters of English
This is a follow up change of Idff0b6d08e.

Bug: 13177865
Change-Id: I00ea7cda954efbd248d2abc2fa6d4995d6acbf19
2014-05-09 12:06:42 +09:00
Tadashi G. Takaoka bf09cb2390 Reorder accented letters of English
Bug: 13177865
Change-Id: Idff0b6d08e6dd0ec1eb39072ba4f99e6ec7df802
2014-05-08 16:20:13 +09: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 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
Tadashi G. Takaoka 9eec53a2c2 Merge "Reorder German umlaut letters" 2014-04-10 06:26:21 +00:00
Tadashi G. Takaoka 784a4429ea Reorder German umlaut letters
Bug: 13940739
Change-Id: I2e377b56e4a74d36c7e0cea4ad4e8d9341eb7feb
2014-04-10 15:24:45 +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
Tadashi G. Takaoka d317796207 Use Locale to process text resources
Change-Id: Ic1c4e1776071332e02c368055157124bb539d14e
2014-04-09 18:28:17 +09:00
Tadashi G. Takaoka 6bb3556ff7 Use locale to look up KeyboardTextsTable
Change-Id: I1e05c7fdbb757efef0e9407dc25482ef1115e49a
2014-04-08 19:12:31 +09:00
Tadashi G. Takaoka 465a2ac534 Refactor make-keyboard-text
Change-Id: Ifaf955ae896a18e5cbc9c1af5a1b7e15942eb886
2014-04-08 17:11:06 +09:00
Ken Wakasa 694114feca Remove redundant LOCAL_IS_HOST_MODULE assignments
Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.

Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558
2014-04-04 22:32:45 +09:00
Ken Wakasa 3ccbf7ef08 32-bit dicttool
As we can't easily turn on -m64 for only one module, the JNI library for
a host tool should be 32-bit, at least for now.

Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
2014-04-04 20:10:04 +09:00
Yohei Yukawa c73b46f40a Do not call exit 1 when loaded with source command
BUG: 13754552
Change-Id: I3d5e4c0786547521325405100c175dd1b21754df
2014-04-02 19:47:08 +09:00
Ken Wakasa 96092ebd78 Use Clang for dicttool
Fix the wrong shared lib name too.

Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
2014-03-27 19:14:37 +09:00
Keisuke Kuroyanagi 6008898b99 Merge "Move code only used for dicttool and tests under tests." 2014-03-27 06:37:10 +00:00
Keisuke Kuroyanagi 93cda5bb39 Move code only used for dicttool and tests under tests.
Bug: 13035567
Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
2014-03-27 15:30:32 +09: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
Jean Chalard cbed462d19 [CB12] Reset the combining state when resetting the composer
Bug: 13406701
Change-Id: I490574b7ca4b953f67dd2c0ef97401297fade0a4
2014-03-24 17:44:31 +09:00
Jean Chalard 835965a75e [CB11] Get the result of the combination
Change-Id: I165ec4a24f5b1334d55c14948e4d942ec40eb33b
2014-03-20 23:33:12 +09:00
Jean Chalard 83372e75e4 Merge "[CB09] Pass events through the combiner chain" 2014-03-20 08:32:36 +00:00
Tadashi G. Takaoka e7420f6bd1 Merge "Utilize autoColumnOrder for punctuation more keys" 2014-03-20 08:01:18 +00:00
Jean Chalard f2bb15b0ab [CB09] Pass events through the combiner chain
Bug: 13406701
Change-Id: I4696f145478afdd132314b7d3c148c3a9ca11c9c
2014-03-20 16:59:29 +09:00
Tadashi G. Takaoka 844205ca2e Utilize autoColumnOrder for punctuation more keys
Change-Id: I1f8f5013f0bdf93cf590b8bd00d680b31e03d8b0
2014-03-20 16:38:38 +09:00
Jean Chalard c083733972 Merge "[CB08] Create a combiner chain in the word composer." 2014-03-20 07:02:48 +00:00
Tadashi G. Takaoka e884fde8d2 Merge "Fix Armenian punctuation order" 2014-03-20 06:43:50 +00:00
Jean Chalard 7ede642df4 [CB08] Create a combiner chain in the word composer.
Bug: 13406701
Change-Id: I3b9f75de9283f76366d1bef7e14a8f22f2186669
2014-03-20 14:27:55 +09:00
Tadashi G. Takaoka d51aebd328 Fix Armenian punctuation order
Bug: 12623502
Change-Id: I6cc026132922e103d212b663664e7e0aa2404b35
2014-03-20 13:17:38 +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 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 4640e7c989 Fix French accented letters order
Bug: 13497958
Change-Id: I062a0e2e75b2f6c2606b1309808cbaa83cc91018
2014-03-19 17:43:53 +09: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
Tadashi G. Takaoka d22bd20b36 Fix comments in XML files
Change-Id: Id0a69f98297d6a827006c6c4fe1304a197381f82
2014-03-17 12:45:39 +09:00
Tadashi G. Takaoka ef27c83e74 Fix Persian symbols shifted output text
Bug: 13017434
Change-Id: I57af849ae4342bfee3fa08d7e90c6a6dbc229380
2014-03-17 12:31:09 +09:00
Tadashi G. Takaoka 538abc27dc Fix Arabic keyboard text and test comments
Bug: 13017434

Change-Id: Iec2ddab719e0c68a70bcf56a90eb4522c5fd7978
2014-03-17 11:56:13 +09:00
Jean Chalard f8accd8839 [CB04] Add an event array to WordComposer.
Bug: 13406701
Change-Id: I9ecd2709c8f1c678a85b0cfaf7c5ed4f78459821
2014-03-14 12:44:49 +09:00
Tadashi G. Takaoka 567fbe90f7 Fix unused text resources of keyboard layouts
Icelandic keyboard has no nordic layout.
Latvian, Lithuanian, and Slovak keyboards have duplicated N WITH ACUTE.
No Language keyboard has duplicated letter a variants.

Change-Id: Iaeacebc1f7efdb70294e6342e42232b73aed9398
2014-03-10 17:31:25 +09:00
Tadashi G. Takaoka e07a777ed6 Fix unneeded u with diaeresis more key on Swedish keyboard
Change-Id: Ib4a17fa464899907616e76426e5df0d370a40f80
2014-03-10 11:15:18 +09:00
Tadashi G. Takaoka 315010636a Fix excessive more keys on Estonian keyboard
Change-Id: I6c2d5d123d519278a6ff0f12fece69ccbad1aad5
2014-03-10 10:56:26 +09:00
Keisuke Kuroyanagi f14cf3e64c Fix: dicttool build.
Change-Id: I5c3bcbe9f3054bdd1a760398fe11344e0e05ac6a
2014-03-07 13:01:48 +00:00
Keisuke Kuroyanagi 32326a9d7a Merge "Move DictionaryOptions from FusionDictionary to FormatSpec." 2014-03-07 10:42:18 +00:00
Keisuke Kuroyanagi a103e29d00 Merge "Separate WeightedString from FusionDictionary." 2014-03-07 09:07:26 +00:00
Ken Wakasa 344742b0d1 Recover the dicttool build except for Mac
With a hack: Temporarily disable host tool build on Mac until the
build system is ready for C++11.

Change-Id: Ib412ba0d7fecc968cc09b4d8fde4e838bdc0618a
2014-03-07 15:04:27 +09:00
Ken Wakasa c290888461 Fix Mac SDK build
Temporary fix.

Change-Id: I79c8c31e7b07776a048a16918008a942261e1115
2014-03-06 23:41:23 +09:00
Ken Wakasa ca0a0da864 Switch to C++11
Change-Id: Ib2970327c36422d7b11103d52ba7e9e52db5554f
2014-03-06 20:32:20 +09:00
Keisuke Kuroyanagi 3ad4af2354 Move DictionaryOptions from FusionDictionary to FormatSpec.
Bug: 8187060
Bug:13035567

Change-Id: Id4f45e589521ae98c926a4c0607be10ce1a983f2
2014-03-06 18:53:09 +09:00
Keisuke Kuroyanagi 516f86815d Separate WeightedString from FusionDictionary.
Bug: 8187060

Change-Id: I40c1dafca3eb52244c64fdb4c1db30a56385d678
2014-03-06 18:53:06 +09:00
Tadashi G. Takaoka dbe531efa8 Merge "Remove unused text resource keylabel_for_east_slavic_row1_12" 2014-03-06 02:47:06 +00:00
Keisuke Kuroyanagi e784148ae6 Separate utility methods from BinaryDictionary.
Bug: 8187060
Change-Id: Ice2984e332b7bd3bb17174aefc80b5635b72fc50
2014-03-05 18:19:34 +09: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
Keisuke Kuroyanagi 472e22a326 Merge "Fix: dicttool build." 2014-02-28 10:13:00 +00:00
Keisuke Kuroyanagi 36305d4207 Fix: dicttool build.
Change-Id: I592b14eba895786d0981586a01ef545e003396c8
2014-02-28 19:04:49 +09:00
Tadashi G. Takaoka 51cb8e6f4e Remove wrong duplicated resource from Afrikaans layout
Bug: 6867914
Change-Id: Ibc329c8ea03abaa91ba27e7e62fb6d02cc67debe
2014-02-27 19:01:49 +09:00
Jean Chalard 890b44e537 Correctly read the header of APK-embedded dicts
Bug: 13164518
Change-Id: I8768ad887af8b89ad9f29637f606c3c68629c7ca
2014-02-24 22:54:01 +09:00
Tadashi G. Takaoka 5eb6ea9f27 Change make-keyboard-text -java option to point LatinIME/java directory
Change-Id: I812713da5918049c0e504e48bd0693df2f7bf46d
2014-02-21 19:24:24 +09:00
Keisuke Kuroyanagi 0fc93fe445 Implement PatriciaTriePolicy::getNextWordAndNextToken().
Bug: 12810574
Change-Id: Id1d44f90de9455d9cbe7b6e0a161cae91d6d422c
2014-02-15 17:39:20 +09:00