Commit graph

2870 commits

Author SHA1 Message Date
Tadashi G. Takaoka
4f72923fa2 Merge "Rename Key.keyLabel attribute to KeySpec" 2014-02-07 09:53:43 +00:00
Tadashi G. Takaoka
4e85476740 Merge "Consolidate keyIcon and code with keyLabel attribute" 2014-02-07 09:53:35 +00:00
Tadashi G. Takaoka
9684b33b69 Rename Key.keyLabel attribute to KeySpec
Change-Id: Ida48cd9bdbc01fefad651a005084262c0f46c41c
2014-02-07 18:47:45 +09:00
Tadashi G. Takaoka
a83a1feb62 Consolidate keyIcon and code with keyLabel attribute
Change-Id: I75fbd348fab5022606ca14552eb03b15af6684c8
2014-02-07 18:47:22 +09:00
Tadashi G. Takaoka
0072f3a774 am 276b1a2e: Add debug settings for keypress popup animations
* commit '276b1a2ebc6d5ea3fa36fa9271cdc6310db34021':
  Add debug settings for keypress popup animations
2014-02-07 01:37:07 -08:00
Tadashi G. Takaoka
276b1a2ebc Add debug settings for keypress popup animations
Bug: 12928125
Change-Id: I49faab754c7d1dcf4a791dfc535d3a78b62ce67a
2014-02-07 18:09:41 +09:00
Tadashi G. Takaoka
32ca47a547 am 48ea5280: Merge "Consolidate keyOutputText with keyLabel attribute"
* commit '48ea52800ac490b0c32c91b9982c7e01a455ffe5':
  Consolidate keyOutputText with keyLabel attribute
2014-02-06 01:37:50 -08:00
Tadashi G. Takaoka
0cd292f20b am a9b67135: Merge "Parse keyLabel for icon, code, and outputText as well"
* commit 'a9b67135bd685bfdc9cbb928be24d2114d64a57a':
  Parse keyLabel for icon, code, and outputText as well
2014-02-06 00:41:14 -08:00
Tadashi G. Takaoka
a9b67135bd Merge "Parse keyLabel for icon, code, and outputText as well" 2014-02-06 08:38:54 +00:00
Tadashi G. Takaoka
cca59581ce am 0df46273: Remove unused smiley key definitions
* commit '0df462730b426f95b8cafe6948c2dc3a6e53e4a6':
  Remove unused smiley key definitions
2014-02-06 00:15:24 -08:00
Tadashi G. Takaoka
0df462730b Remove unused smiley key definitions
Change-Id: Icbdfb360abab2964869898949774f47197f6d000
2014-02-06 16:56:42 +09:00
Tadashi G. Takaoka
d6f147e142 Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
2014-02-06 16:42:57 +09:00
Tadashi G. Takaoka
6193217f5c Parse keyLabel for icon, code, and outputText as well
Change-Id: I023915b68b4aabd056c2c1eb745876471556e15e
2014-02-06 16:42:17 +09:00
Geoff Mendal
2212385061 Import translations. DO NOT MERGE
Change-Id: Ib99535e93fac58d7e5b22595015096b7be9d0d98
Auto-generated-cl: translation import
2014-02-05 16:55:40 -08:00
Geoff Mendal
4ffa78cd92 Import translations. DO NOT MERGE
Change-Id: I0ff7e7a2306ba4e523cb5ef2eac5e8e68cc5351a
Auto-generated-cl: translation import
2014-02-05 16:53:26 -08:00
Keisuke Kuroyanagi
f34a3e23d0 am 866fd420: Merge "Add dictionary dump buttons in debug settings."
* commit '866fd42091cd408404d35fdafd2cb6cd586fdbf0':
  Add dictionary dump buttons in debug settings.
2014-02-04 05:53:05 -08:00
Keisuke Kuroyanagi
36c7a62dff Add dictionary dump buttons in debug settings.
Bug: 11736680
Bug: 12810574
Change-Id: I1f797b5ac6acf94b40d9698d4535e8f5da2bfb17
2014-02-04 21:29:09 +09:00
Geoff Mendal
0251c60b44 Merge "Import translations. DO NOT MERGE" 2014-02-04 03:19:22 +00:00
Geoff Mendal
9d9fd48fa2 Import translations. DO NOT MERGE
Change-Id: Ie6d3ca2063815af9086252dd4e2ce177acbb85bb
Auto-generated-cl: translation import
2014-02-03 19:18:16 -08:00
Geoff Mendal
6c88544f95 Import translations. DO NOT MERGE
Change-Id: I7b3358893fca57f1ddc457c74daff9b3b2eb2ee4
Auto-generated-cl: translation import
2014-02-03 19:17:35 -08:00
Geoff Mendal
db63c457fa Import translations. DO NOT MERGE
Change-Id: I6b376f39198a05ff070f3abc81addb69924096d2
Auto-generated-cl: translation import
2014-02-03 19:16:51 -08:00
Tadashi G. Takaoka
b247cafcc0 am 4d539f2c: Merge "Fix important notice strip text layout"
* commit '4d539f2c1e6120651aafce5104e15f2b484af033':
  Fix important notice strip text layout
2014-02-03 06:10:05 -08:00
Tadashi G. Takaoka
9706f9a2f4 Fix important notice strip text layout
Bug: 10587358
Change-Id: I9cbdd3b450e05d6d0611a16b6b7fad945918dd5f
2014-02-03 18:07:19 +09:00
Tadashi G. Takaoka
c7f41139bc am 2abe1ced: Merge "Add important notice strip"
* commit '2abe1cedc87768a5639bfef83c4217addd877f92':
  Add important notice strip
2014-01-31 08:21:52 -08:00
Tadashi G. Takaoka
8a296e43c9 Add important notice strip
This change is a groundwork to show important notice.

Bug: 10587358
Change-Id: I80aa70d30e2a529b37798f0df2183b41df3ac38a
2014-01-31 20:07:27 +09:00
Tadashi G. Takaoka
e8c5999336 am be0d05c5: Merge "Move important notice version to resource"
* commit 'be0d05c5efcaaf69e02e82f886ec2afd871883b0':
  Move important notice version to resource
2014-01-30 23:39:38 -08:00
Tadashi G. Takaoka
5b8ffad26c Move important notice version to resource
Bug: 10587358
Change-Id: Ie24fc6c53b15880f4ace991a25223056f03f5eda
2014-01-31 12:49:36 +09:00
Tadashi G. Takaoka
0f218b066d am 776d46a7: Merge "Show "Touch again to save" in system locale"
* commit '776d46a771089482c68be56e81219bbd7bb559e4':
  Show "Touch again to save" in system locale
2014-01-30 01:36:41 -08:00
Tadashi G. Takaoka
9b1a66843d Show "Touch again to save" in system locale
Bug: 12811156
Change-Id: I928daf17297ec5c526720850d6203cb9af0496ac
2014-01-30 18:03:23 +09:00
Tadashi G. Takaoka
306080ee3f am d432892f: Fix Farsi keyboard comma and period
* commit 'd432892f0cd480efa03e0ff101596ac44d89f4f2':
  Fix Farsi keyboard comma and period
2014-01-29 23:12:49 -08:00
Tadashi G. Takaoka
d432892f0c Fix Farsi keyboard comma and period
Bug: 12807701
Change-Id: I49503e9945d97e13d7cc98f54ca071cb935d1e52
2014-01-30 15:45:23 +09:00
Tadashi G. Takaoka
937bd8a541 am 005d2454: Merge "Remove suggestion_word and suggestion_info layout files"
* commit '005d2454c97400bef3da7961267fe6b943da5833':
  Remove suggestion_word and suggestion_info layout files
2014-01-28 17:07:51 -08:00
Tadashi G. Takaoka
c2ea3f7dd9 Remove suggestion_word and suggestion_info layout files
Change-Id: I37fea41cfc6e717ce7e5aa36ad331675fc9e8ce5
2014-01-28 19:38:35 +09:00
Tadashi G. Takaoka
a15565eca6 am 95e5e267: Merge "Suggestion strip honors RTL layout"
* commit '95e5e267ac1aca7c5a7db2ceea96716437c6b2fe':
  Suggestion strip honors RTL layout
2014-01-27 23:53:32 -08:00
Tadashi G. Takaoka
bcd30bf3e7 Suggestion strip honors RTL layout
Bug: 9126496
Change-Id: Ia4a1c52bd2a80ea7fe6b9529f2767fee5f9e8aeb
2014-01-28 15:47:54 +09:00
Baligh Uddin
16a9bb3da8 Import translations. DO NOT MERGE
Change-Id: I9632cf713ad9e1bba1df5819c4038739229f7ec2
Auto-generated-cl: translation import
2014-01-27 14:42:02 -08:00
Baligh Uddin
92b67fc32b Import translations. DO NOT MERGE
Change-Id: I4aa5b70b2bb231583501347c69dba7172aa975cb
Auto-generated-cl: translation import
2014-01-27 14:40:58 -08:00
Tadashi G. Takaoka
c8bddebf1a am 1e4b1300: Merge "Refactor SuggestionsStripLayoutHelper class"
* commit '1e4b1300e65095ca4b064afb5590d4bc02ff7725':
  Refactor SuggestionsStripLayoutHelper class
2014-01-27 01:39:02 -08:00
Tadashi G. Takaoka
148dedbc5d Refactor SuggestionsStripLayoutHelper class
Bug: 9126496
Change-Id: I8bede13c8745fbcad68099d882681ca4f2326d14
2014-01-27 18:25:25 +09:00
Baligh Uddin
6a39811d90 Merge "Import translations. DO NOT MERGE" 2014-01-23 21:02:33 +00:00
Baligh Uddin
5047b4aa84 Import translations. DO NOT MERGE
Change-Id: Ib5a8be5d9ac508d57648e4e8811805eea4355fc3
Auto-generated-cl: translation import
2014-01-23 12:25:35 -08:00
Baligh Uddin
9d7c6aafde Import translations. DO NOT MERGE
Change-Id: I4ddadf6504a80fc0955c03496eeefc6c665d0965
Auto-generated-cl: translation import
2014-01-23 12:24:12 -08:00
Baligh Uddin
2efb58fc98 Import translations. DO NOT MERGE
Change-Id: I6c8aa53b9be4c3aa5822a820cc8cfdc3cf31c390
Auto-generated-cl: translation import
2014-01-23 12:22:23 -08:00
Tadashi G. Takaoka
08ce454aa5 Fix newline string resource
The newline string resource "\n" doesn't work off-device simulation.

Bug: 12623502
Change-Id: I3ad63d8afe50be174493d43f00f7191062c87cb7
2014-01-20 19:36:20 +09:00
Geoff Mendal
5802fb05a8 Import translations. DO NOT MERGE
Change-Id: I9d276ae4391f209e2db3a080b3221e5a8aa59938
Auto-generated-cl: translation import
2014-01-15 16:42:37 -08:00
Tadashi G. Takaoka
2d1e72b774 Merge "Revert "Disable Nepali layouts temporarily per product call"" 2014-01-15 03:50:58 +00:00
Tadashi G. Takaoka
4d1620f895 Revert "Disable Nepali layouts temporarily per product call"
This reverts Id58cdf117d.
This also partially reverts I99be3d54d3.

This change must be checked in together with Ied923ed80b.

Bug: 6910787
Change-Id: Icdeee1b93a6b626b43fefc06d3bb3fe40d2e056b
2014-01-15 12:31:44 +09:00
Tadashi G. Takaoka
7ae9efbb6a Revert "Remove Azerbaijani subtype"
This reverts I0d2a98dffe.
This also partially reverts I99be3d54d3.

This change must be checked in together with Ibf49c89832.

Bug: 7963448
Change-Id: Idbb3e1ac9f4e067a0051f618946a345632102fb3
2014-01-15 12:13:25 +09:00
Narayan Kamath
4f8e678bab Revert "Revert "Disable Nepali layouts temporarily per product call""
This reverts commit 93fdfc110b.

Change-Id: Ibe7bfa07aa2437701794209c16f017a88cd166b4
2014-01-14 12:44:11 +00:00
Tadashi G. Takaoka
93fdfc110b Revert "Disable Nepali layouts temporarily per product call"
This reverts Id58cdf117d.
This also partially reverts I456268b68f.

This change must be checked in together with I4d5c8ffa45.

Bug: 6910787
Change-Id: I59ba69f1b14164edea8eddf3784554a29a97e9b3
2014-01-14 17:39:24 +09:00
Tadashi G. Takaoka
7504913807 Move phrase gesture related string resources to AOSP
This change must be checked in together with Ica8fc5135.

Change-Id: I288d7083391954f1266a9b77ee4ffc0bc9d4229d
2014-01-14 17:15:41 +09:00
Jean Chalard
62df0a6d53 Merge "Update dictionaries" 2014-01-14 03:44:20 +00:00
Jean Chalard
155cb77231 Update dictionaries
This change has no effect on TRT results.

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654051
  version : 42 <=> 43
Body :
Added: dialogue 120
Added: dialogues 94

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> dictionaries/it_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

>>> java/res/raw/main_fr.dict
Header :
  date : 1381226409 <=> 1389654052
  version : 42 <=> 43
Body :
Deleted: d'Orange 114
Added: d'orange 114

>>> java/res/raw/main_it.dict
Header :
  date : 1380519383 <=> 1389654052
  version : 40 <=> 43
Body :
Freq changed: ciao 85 -> 180

Bug: 12487270
Bug: 12344108
Change-Id: I94768e223d05ad2551a5508e9e01222a028665c4
2014-01-14 10:37:15 +09:00
Geoff Mendal
9fa6663403 Import translations. DO NOT MERGE
Change-Id: I3233aa7d5f64fbf8818e0065cd1da47d84070fb6
Auto-generated-cl: translation import
2014-01-13 16:31:58 -08:00
Keisuke Kuroyanagi
f96e0f07af Merge "Periodic wipe of the personalization dict." 2014-01-10 09:31:22 +00:00
Keisuke Kuroyanagi
ba07df7fc1 Periodic wipe of the personalization dict.
Bug: 12216453

Change-Id: Ie59dd19c044e9b1eb9b8bd805366200737ea506a
2014-01-10 16:30:59 +09:00
Jean Chalard
eab4d25210 Merge "Remove some warnings" 2014-01-09 05:45:10 +00:00
Jean Chalard
b11339b3ab Remove some warnings
Change-Id: I5cfa0d2fccc139bd6c45c5590a68c3e0c90534b8
2014-01-09 14:04:34 +09:00
Baligh Uddin
941a4540bc Import translations. DO NOT MERGE
Change-Id: Ia2d0f4528529df463307e1706cd4d7265b3958c1
Auto-generated-cl: translation import
2014-01-08 13:45:51 -08:00
Baligh Uddin
f75017de55 Import translations. DO NOT MERGE
Change-Id: Ia0ef830a5bb3ed6fee1a5d113b2baec60bb51a97
Auto-generated-cl: translation import
2014-01-07 07:27:26 -08:00
Tadashi G. Takaoka
74b5291b84 Merge "Remove language switch key from symbols and symbols shift keyboard" 2014-01-06 06:19:27 +00:00
Tadashi G. Takaoka
d561228f95 Remove language switch key from symbols and symbols shift keyboard
This change also fixes the background color of the left keys of the space key.

Bug: 12407208
Change-Id: Id869605146e9f72835f892c3c7ae14f118177394
2014-01-06 15:02:50 +09:00
Tadashi G. Takaoka
12ba821bfb Add description of disabled voice input key option
Bug: 12377179
Change-Id: I44d35c6fa82883710674ecca6f630d09076472fe
2014-01-06 12:11:55 +09:00
Keisuke Kuroyanagi
5c4bd20331 Remove "Boost personalization dictionary" from settings.
Change-Id: Iab05e42e947610f358472cd95d0319d0ab3f0b31
2013-12-25 19:02:49 +09:00
Tadashi G. Takaoka
9c4de1e5f7 Use config_screen_metrics resource in BogusMoveEventDetector
Change-Id: I6b957b43c6dd7ce4f639e46d248179662c1ee669
2013-12-20 17:35:19 +09:00
Baligh Uddin
4f878a71b9 Import translations. DO NOT MERGE
Change-Id: Iec55106743e61ca92f934f1280b0faf0bb2f4b1b
Auto-generated-cl: translation import
2013-12-19 14:18:14 -08:00
Baligh Uddin
5e88407c18 Merge "Import translations. DO NOT MERGE" 2013-12-17 17:46:03 +00:00
Ken Wakasa
da173b6ee3 Merge "Move "Personalized suggestions" option." 2013-12-17 13:52:00 +00:00
Keisuke Kuroyanagi
0a8e307a5f Move "Personalized suggestions" option.
Bug: 11757851
Change-Id: I07411d53b75be767426571edca371f991efc97cb
2013-12-17 21:01:06 +09:00
Tadashi G. Takaoka
3bb64ff3b2 Add Armenian "ligature ech yiwn" hint label
Bug: 12100704
Change-Id: I9debef1662c29ab88f27b2fdd61d5f703c3a1c78
2013-12-17 10:51:02 +09:00
Baligh Uddin
2ea0d56fb5 Import translations. DO NOT MERGE
Change-Id: Iad038e310497a74f167e7f6cfda1f3bee6cd8f09
Auto-generated-cl: translation import
2013-12-16 17:37:20 -08:00
Keisuke Kuroyanagi
d4bb7df412 Add option to enable personalization dictionaries.
Bug: 11757851

Change-Id: I4872c10793d4fd55c0bd9e5bc4650925de6d2c1d
2013-12-16 19:17:31 +09:00
Tadashi G. Takaoka
3f6c983adc Merge "Don't use fullscreen mode on large phone" 2013-12-16 05:56:09 +00:00
Tadashi G. Takaoka
d75d77200f Don't use fullscreen mode on large phone
Bug: 11920652
Change-Id: Icc26c20c881bc586c800c31c90a45281dc408d2a
2013-12-16 13:09:13 +09:00
Ken Wakasa
2c25c7c9e1 Fix locale names in the make-keyboard-text tool
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
2013-12-14 18:50:57 +09:00
Tadashi G. Takaoka
a5b196e939 [FIX] Separate form factor dependent config resources
This is a cherry-pick of I668b55a514.

Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
2013-12-13 18:01:01 +09:00
Ken Wakasa
2fa3693c26 Reset to 9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
Geoff Mendal
8db783ba81 Import translations. DO NOT MERGE
Change-Id: I6c8ab6cd6d41a6692ef6b084e0218be4120d266c
Auto-generated-cl: translation import
2013-12-02 15:05:00 -08:00
Geoff Mendal
7debaee7a4 Import translations. DO NOT MERGE
Change-Id: Ib38c02136778584dc6a4d4215c6e346b2b48afaa
Auto-generated-cl: translation import
2013-11-25 14:26:44 -08:00
Tadashi G. Takaoka
2eea2d5007 Update Color Scheme summary explicitly
Bug: 11622614
Change-Id: I5464054425e4d688eaa39f96ba9a3a3c613c6f42
2013-11-22 17:26:59 -08:00
Satoshi Kataoka
ca5cdc6996 Show mic key option on sw540 device
Bug: 11737760

Change-Id: Id50a7d393acf755cb04d3f8dc60327abeee5a671
2013-11-22 17:26:51 -08:00
Tadashi G. Takaoka
db86a6f271 Add keyboard color switch option
Bug: 11622614
Change-Id: I25aa1ff7376fe72fd94ab2cb7190c61d7a98a1af
2013-11-22 17:26:33 -08:00
Tadashi G. Takaoka
51352009b5 Add JB/ICS resources from Azuki MR1 release
Bug: 11622614
Change-Id: I126fc42dd31e912788db0446b67a9d4ea80f848e
2013-11-22 17:26:26 -08:00
Tadashi G. Takaoka
fe5262a70d Rename KLP theme related resources
Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
2013-11-22 17:26:17 -08:00
Tadashi G. Takaoka
d5e6044ded Rename KLP/JB/ICS common resource name suffixes to _holo
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
2013-11-22 17:26:08 -08:00
Tadashi G. Takaoka
978e2f67f7 Add key press vibration value for Motorola DVX
Bug: 10884131
Change-Id: Id6d5589f3528de05c7b346ce55e926c3e18f22cc
2013-11-22 17:25:57 -08:00
Baligh Uddin
b4cc0ae075 Import translations. DO NOT MERGE
This is a manual cherry-pick of Ib0c14a756a.  This change also copied
some missing locales' strings.xml and strings-action-keys.xml from
jb-ub-latinimegoogle branch.

Bug: 11622614
Change-Id: Ibc9cde4662b15da63b73ac2b545e0e94c358de67
2013-11-21 11:28:47 +09:00
Tadashi G. Takaoka
a5f5ab84c0 Add microphone key as long press of comma
Bug: 11637249
Change-Id: Ib6202484ad12c63c8a38d8e12432007ab56d4a30
2013-11-12 22:44:59 -08:00
Tadashi G. Takaoka
7033338017 Update popup panel background a bit draker
Bug: 11169026
Change-Id: I164ab69eb263f58000ffed7b7d97fc6b356147d5
2013-11-12 22:44:58 -08:00
Tadashi G. Takaoka
d7d6088130 Revert back punctuations to the more keys keyboard of the period
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
2013-11-12 17:51:54 +09:00
Baligh Uddin
7505290c9a Import translations. DO NOT MERGE
Change-Id: I598c4282b342132f3f9937a9652f570c3c1bc246
Auto-generated-cl: translation import
2013-11-04 23:24:59 -08:00
Baligh Uddin
21dc0bfef0 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bayo 2013-11-01 14:28:23 +00:00
Baligh Uddin
b8ee18c7fe These files were in the obsoleted locale
directories and are not processed by the translation pipeline.
Moving them to their new locale directory.

Example: values-et/bools.xml moved to values-et-rEE/bools.xml

Bug: 11244796
2013-10-31 20:44:05 -07:00
Baligh Uddin
7a5907b580 Import translations. DO NOT MERGE
Change-Id: If3b0f523c86598e0dcf3d3c41e3bfcd5f87c116d
Auto-generated-cl: translation import
2013-10-28 23:40:45 -07:00
Ken Wakasa
79ccba757a Update Setup Wizard welcome video & image
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
2013-10-22 05:23:48 -07:00
Satoshi Kataoka
a6ee1e7b9a Don't show long-pressing emoji key on tablet
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
2013-10-22 05:23:47 -07:00
Satoshi Kataoka
c43738069a Fix keyboard layout
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
2013-10-22 05:23:47 -07:00
Ken Wakasa
08360a5434 am a62dc281: Update input method subtype locales.
* commit 'a62dc28121d72978d527eec2791d1caf43b563b8':
  Update input method subtype locales.

Change-Id: Id28f5ee33c201e1d335119c1b3d99bc30a10a131
2013-10-22 19:43:09 +09:00
Satoshi Kataoka
e4db349db0 am af846af8: Remove Azerbaijani subtype
* commit 'af846af8bb7e4b49c99d7b0e051e70d03a5b7359':
  Remove Azerbaijani subtype
2013-10-22 19:36:41 +09:00
Satoshi Kataoka
1760d363d4 Remove unexpectedly used resources
Change-Id: I291269dbca71805a40d48a0e373b9561ad075f6b
2013-10-18 15:05:35 +09:00