Commit graph

11338 commits

Author SHA1 Message Date
Ken Wakasa
5fd5555d23 am ef8a1be4: am 5f57fe4a: Merge "Revert "Remove unused Key and Keyboard attributes"" into lmp-dev
* commit 'ef8a1be46f253ac75c89af9d88c390efd95d3532':
  Revert "Remove unused Key and Keyboard attributes"
2014-08-07 11:48:15 +00:00
Ken Wakasa
e4ea3cce2c am 50cae6f0: am 52183821: Merge "Revert "Tune number letter size of Material keyboard"" into lmp-dev
* commit '50cae6f08c53c7fda6f62058227b80a70e9ed1c4':
  Revert "Tune number letter size of Material keyboard"
2014-08-07 11:48:14 +00:00
Ken Wakasa
bef6c4c44a am c8f384ea: am 1c7e6f8d: Merge "Revert "Align hint label to bottom"" into lmp-dev
* commit 'c8f384ea6a15180d5894dfc2fed03865c49f2fe3':
  Revert "Align hint label to bottom"
2014-08-07 11:48:12 +00: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
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
Keisuke Kuroyanagi
ba18f6e6cb am e44c4d25: am b6665d95: Merge "Use DistracterFilterCheckingIsInDictionary for User History" into lmp-dev
* commit 'e44c4d254182f0db042eb5a815305fa555148ba4':
  Use DistracterFilterCheckingIsInDictionary for User History
2014-08-07 10:32:49 +00:00
Tadashi G. Takaoka
ca0368c0d6 am 304b92c3: am f1784266: Align hint label to bottom
* commit '304b92c3efb5dd1db622dacec678a85c3c6ced95':
  Align hint label to bottom
2014-08-07 09:58:48 +00:00
Tadashi G. Takaoka
f1784266ec Align hint label to bottom
Bug: 14419121
Change-Id: I9147d3c4a3687ed745ffdddfff221d88652919b2
2014-08-07 18:42:47 +09:00
Tadashi G. Takaoka
56baf7860b am 521298dd: am 44454c2b: Tune number letter size of Material keyboard
* commit '521298dd083de524cddec15fded86246436ac29c':
  Tune number letter size of Material keyboard
2014-08-07 09:21:52 +00:00
Tadashi G. Takaoka
7790102b0d am 56e6df25: am 6ba5d636: Merge "Remove unused Key and Keyboard attributes" into lmp-dev
* commit '56e6df2561141978e33356b142279398dbf6985a':
  Remove unused Key and Keyboard attributes
2014-08-07 09:12:48 +00:00
Tadashi G. Takaoka
0bed75a818 am 0851d351: am e988e412: Merge "Add Key label off center attribute" into lmp-dev
* commit '0851d351332e6191857d81e245a6025c02c84219':
  Add Key label off center attribute
2014-08-07 09:03:58 +00:00
Tadashi G. Takaoka
fdb0001851 am ff1e338e: am 91f47b03: Merge "Remove unused animation resources" into lmp-dev
* commit 'ff1e338e5b412236aafc6234244f6187fded782c':
  Remove unused animation resources
2014-08-07 09:03:57 +00:00
Tadashi G. Takaoka
001c186b2e am ec44b04b: am 0c2dc410: Merge "Clean up Keyboard and KeyboardView theme" into lmp-dev
* commit 'ec44b04b04b2f0f944be57671dfadaddb3bd4c3e':
  Clean up Keyboard and KeyboardView theme
2014-08-07 09:03:56 +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
85c29bd2bb am bfcb3323: am e19c520b: Align space key icon to bottom of a key
* commit 'bfcb3323d2d7165984038f9eff3e49bc824a6d0f':
  Align space key icon to bottom of a key
2014-08-07 04:02:58 +00: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
95d2c4fbed am d5e4e367: am 3316dcd4: Merge "Revert "Introduce onEvent() to improve testability"" into lmp-dev
* commit 'd5e4e367f21407da7a5f62a18e601957b07b6f4d':
  Revert "Introduce onEvent() to improve testability"
2014-08-07 00:13:09 +00:00
Geoff Mendal
d34354ee67 Merge "Import translations. DO NOT MERGE" 2014-08-05 00:29:22 +00:00
Geoff Mendal
086f9d54af Import translations. DO NOT MERGE
Change-Id: I649fa8860a39804aff07aaf6c3c5cb09a282f7cf
Auto-generated-cl: translation import
2014-08-06 13:23:50 -07:00
Geoff Mendal
59121d519b Merge "Import translations. DO NOT MERGE" 2014-08-06 17:19:40 +00:00
Geoff Mendal
c48a1a73e3 Import translations. DO NOT MERGE
Change-Id: I88c0d488ee62e184b44b81073a9fa5343ace2f77
Auto-generated-cl: translation import
2014-08-06 13:15:36 -07:00
Tadashi G. Takaoka
28b8f349df am 94a568a8: am 868395c6: Merge "Mark hind_compact layout as completed" into lmp-dev
* commit '94a568a8635d6362398f059fdea662b9d9165267':
  Mark hind_compact layout as completed
2014-08-06 17:40:11 +00:00
Jean Chalard
78d9b7c4a0 am bc043c31: am 1f3d89c2: Revert "[HS1] Save some data in startInputView"
* commit 'bc043c31ded2dd48008b185503475e440f302aa0':
  Revert "[HS1] Save some data in startInputView"
2014-08-06 17:38:51 +00:00
Jean Chalard
bd38799e27 am fe807696: am 772a8019: Revert "[HS2] Move more stuff to onStartInput"
* commit 'fe807696566a5975b4d0932c72a05593a98f13d3':
  Revert "[HS2] Move more stuff to onStartInput"
2014-08-06 17:38:50 +00:00
Tadashi G. Takaoka
c8b860e3e1 am 571320ad: am 5dee1fd6: Merge "Add dedicated background for custom action label key" into lmp-dev
* commit '571320ad90b2ac2bb9fa77cf6700feec3bc4030a':
  Add dedicated background for custom action label key
2014-08-06 17:38:49 +00:00
Jean Chalard
09ae6b9119 am 922411a7: am ef74e737: Introduce onEvent() to improve testability
* commit '922411a70804921e69df0ef477f6b007e83d5692':
  Introduce onEvent() to improve testability
2014-08-06 17:38:47 +00:00
Jean Chalard
43cf1ae7bb am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev
* commit 'f66b0e5f71be61e496bd8b77f04384ea14b75da7':
  Fix an NPE when running with Keep.
2014-08-06 17:38:45 +00:00
Tadashi G. Takaoka
0bfcb89ac4 am e8668c2e: am aa3ff194: Merge "Use add icon for add custom input style menu" into lmp-dev
* commit 'e8668c2ee2dac5168e1af8484fb9ae2a0534b442':
  Use add icon for add custom input style menu
2014-08-06 17:38:43 +00:00
Jean Chalard
d393cf065a am 98e27483: am 9273f383: [HS3] Fix a bug on ICS
* commit '98e2748363355d2286215c798225d529f3a1cb34':
  [HS3] Fix a bug on ICS
2014-08-06 17:38:34 +00:00
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
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
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
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
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
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
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
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
0f2de75e31 Merge "Revert "Remove unused animation resources"" into lmp-dev 2014-08-05 00:03:09 +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
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
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
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
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