Satoshi Kataoka
ba212e9d76
Add a facility to dump the dictionary contents while closing
...
Change-Id: I02e920e0512f2b46a778f0b23f7ca03f8d5dabe6
2013-10-28 11:25:38 -07:00
Keisuke Kuroyanagi
6e23e336ff
Merge "Add a test for ver4 native binary dictionary."
2013-10-28 16:14:45 +00:00
Baligh Uddin
d1575a9d89
Import translations. DO NOT MERGE
...
Change-Id: I9c2c9578bbc0a7036c7ee4c6b8a605ef90ae6001
Auto-generated-cl: translation import
2013-10-25 14:43:14 -07:00
Keisuke Kuroyanagi
8e9df884aa
Add a test for ver4 native binary dictionary.
...
Bug: 10197478
Bug: 11073222
Change-Id: I6daac6c4b048c65682c25afe6ca0fad83cc9720f
2013-10-25 12:32:30 -07:00
Jean Chalard
d4b5bc1695
Merge "Preliminary refactor"
2013-10-22 11:26:54 +00:00
Jean Chalard
b00ed46385
Preliminary refactor
...
Bug: 11328842
Change-Id: I7c22e951fef9bc4443c6b64625e25f632f876ab1
2013-10-22 20:16:17 +09:00
Jean Chalard
729abe6332
Stopgap solution for a crash.
...
This returns the wrong string, but since it's used for getting the
previous word for bigrams, it only results in slightly worse
suggestions quality.
Bug: 11273655
Change-Id: I6ce5de2f76effc453ca691a654ab6bf17445b9e7
2013-10-22 20:00:09 +09:00
Jean Chalard
926ebe849a
Merge "Add a sequence number to SuggestedWords."
2013-10-22 04:02:11 +00:00
Jean Chalard
ac76463306
Add a sequence number to SuggestedWords.
...
This allows testing for suggestion freshness in an asynchronous
suggestions world.
Bug: 11301597
Change-Id: Ic76cd17568598d8534aec81e037f9e37f52eb6b4
2013-10-22 12:52:58 +09:00
Jean Chalard
c6a121805f
Fix a bug where autocaps would jam auto-commit
...
Bug: 11311002
Change-Id: I62955e364c9ffc75322cf05fa3ad7985f1d09259
2013-10-22 12:39:49 +09:00
Ken Wakasa
859b117118
Update Setup Wizard welcome video & image
...
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
2013-10-22 09:36:39 +09:00
Ken Wakasa
513b99dfa2
Cosmetic fixes
...
Change-Id: I44ac89edaba2e57bd1b7e091ff74b77a5e598f2f
2013-10-21 15:53:49 +09:00
Yuichiro Hanada
52f18d7f40
Change the block sizes for SparseTables.
...
This change saves about 240k bytes.
Bug: 10941472
Change-Id: Ieb00e4dd3391cdb0d42d705f8d0a7b1421f516f9
2013-10-18 20:28:07 +09:00
Keisuke Kuroyanagi
8e9af925b1
Merge "Fix: Suggested words from user history are invalid."
2013-10-18 11:05:03 +00:00
Keisuke Kuroyanagi
53686e0f5f
Fix: Suggested words from user history are invalid.
...
- Suggestions form user history can contain invalid words.
- isValidWord always returns false.
Bug: 11139426
Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
2013-10-18 19:53:57 +09:00
Satoshi Kataoka
7fdb2c2956
Merge "Change the numbering order of terminal IDs."
2013-10-18 10:31:27 +00:00
Yuichiro Hanada
9ae7d37108
Change the numbering order of terminal IDs.
...
Change-Id: I85a6b6e948ee0de012eef2f9f841240cbca63947
2013-10-18 19:16:11 +09:00
Yuichiro Hanada
2b7110ff1f
(2/2) Implement insertWord in Ver4DictUpdater.
...
Change-Id: I2328a9df0a009b564e8acaf4180f9b0c1ed0901a
2013-10-18 18:03:44 +09:00
Yuichiro Hanada
19b247e79d
Fix the name of the argument of writeString.
...
Change-Id: I76916914f1402913daa56dd5387fe82e42287989
2013-10-18 17:33:10 +09:00
Jean Chalard
7e7fe6057a
Merge "(1/2) Implement insertWord in Ver4DictUpdater."
2013-10-18 08:00:04 +00:00
Ken Wakasa
a62dc28121
Update input method subtype locales.
...
To match up with the removal of obsolete locales.
bug: 11244796
Change-Id: I27098bfa26b66631ef412f8f0f72e0273a0161bc
2013-10-18 16:44:38 +09:00
Yuichiro Hanada
520f612849
(1/2) Implement insertWord in Ver4DictUpdater.
...
Change-Id: Ia3079d5ef00ca7d831c91fb9220ad9c17038c5a3
2013-10-18 16:42:59 +09:00
Satoshi Kataoka
27106487ba
Remove unexpectedly used resources
...
Change-Id: I0ddd1dfd54c76177660448d156a6c670f5579671
2013-10-18 11:53:32 +09:00
Baligh Uddin
f4fd6017a0
am 8ccb79eb: am 66bdabad: am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
...
* commit '8ccb79ebab1ece201da95866d2673e43752a949c':
These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
2013-10-17 14:40:24 -07:00
Baligh Uddin
66bdabad80
am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
...
* commit 'e47f7332f9bb94905015061dd9791f43763ccab8':
These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
2013-10-17 11:26:35 -07:00
Baligh Uddin
a7cebb8c5c
am 486c5896: Remove obsolete locale directories.
...
* commit '486c5896102cccfaa79d2109272ab7235dcacf38':
Remove obsolete locale directories.
2013-10-17 11:26:33 -07:00
Baligh Uddin
e47f7332f9
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-17 11:22:07 -07:00
Baligh Uddin
486c589610
Remove obsolete locale directories.
...
Bug: 11244796
2013-10-17 11:15:33 -07:00
Ken Wakasa
a79431b42b
am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:28:49 -07:00
Ken Wakasa
d8ba6abfee
Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
2013-10-17 16:26:42 +00:00
Baligh Uddin
765c40cd76
Merge "Import translations. DO NOT MERGE"
2013-10-17 15:47:22 +00:00
Baligh Uddin
38a2099808
Import translations. DO NOT MERGE
...
Change-Id: Ibf795b67b9198d7357815db183d939ff703d064f
Auto-generated-cl: translation import
2013-10-17 08:46:20 -07:00
Baligh Uddin
8d757c2052
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-17 15:45:30 +00:00
Baligh Uddin
9fa7efb0c5
Import translations. DO NOT MERGE
...
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
2013-10-17 08:40:51 -07:00
Jean Chalard
a3c285e876
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 23:15:09 +09:00
Jean Chalard
0f45e1bfbc
Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 22:58:34 +09:00
Satoshi Kataoka
0f5256e500
Merge "Don't show long-pressing emoji key on tablet"
2013-10-17 11:37:58 +00:00
Satoshi Kataoka
b2f5e0639f
Don't show long-pressing emoji key on tablet
...
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
2013-10-17 17:53:33 +09:00
Satoshi Kataoka
0d43ce28c7
Merge "Fix keyboard layout"
2013-10-17 08:33:56 +00:00
Satoshi Kataoka
e2d531c0fd
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-17 16:37:26 +09:00
Jean Chalard
578e9b91c1
Merge "Remove useless code."
2013-10-17 06:56:12 +00:00
Jean Chalard
8447409c77
Merge "Remove mIsExpectingUpdateSelection."
2013-10-17 06:55:54 +00:00
Yuichiro Hanada
ad5b9bcec2
Add readVer4PtNodeInfo to Ver4DictDecoder.
...
Change-Id: Ibffaf64a9bda1fb0779a9b53558ca56ed31660d3
2013-10-17 14:37:04 +09:00
Yuichiro Hanada
36dd126ab4
Add ShortcutContentReader.
...
Change-Id: I7c2d0d86d85775065a9bcb2b4a8463bb4969579e
2013-10-17 11:11:29 +09:00
Satoshi Kataoka
bfef552e62
am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:22:41 -07:00
Satoshi Kataoka
ea3db813cc
Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
2013-10-16 21:19:59 +00:00
Jean Chalard
548716d6d9
Remove useless code.
...
The only use of mDeleteCount is to implement delete
acceleration. It's reset at each non-delete code point, and
is guarded by a timer.
Plus, ultimately we want to remove this completely :
acceleration should be implemented by actually deleting
stuff faster, not by deleting several code points at a time.
Change-Id: Ia3144860b3aa2499034f2a2a7c81f32087af9598
2013-10-16 18:43:15 +09:00
Satoshi Kataoka
11384432bf
Merge "Fix typo"
2013-10-16 09:42:08 +00:00
Jean Chalard
5731b86b88
Merge "Remove unneeded code."
2013-10-16 09:41:44 +00:00
Satoshi Kataoka
22f67ff55e
Fix typo
...
Change-Id: I4748935c3cf00e4a3c02aabe2ea659e1c8c2d7c6
2013-10-16 18:40:28 +09:00
Satoshi Kataoka
3dd33652e4
Do not merge. Remove Azerbaijani subtype
...
The corresponding change is I0d2a98dffe03ebd
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 18:39:59 +09:00
Jean Chalard
1194b2b204
Remove mIsExpectingUpdateSelection.
...
Bug: 11226045
Change-Id: I043f90ba92989bd8307c978eb32630439f63a0b9
2013-10-16 18:39:20 +09:00
Jean Chalard
497976e09b
Remove unneeded code.
...
We don't support LOG_FULL_TEXTVIEW_CONTENTS any more, nor do
we have any plans to support it again in the future.
This also is a prelude to removing mIsExpectingUpdateSelection.
Bug: 11226045
Change-Id: Ib68c6daf52993b87225a7ea9e71a414caaecfdb7
2013-10-16 18:36:16 +09:00
Yuichiro Hanada
098639d99f
Add SparseContentTableReader.
...
Change-Id: I976afc5d320bc65835d659bae1d10d2cdc68262b
2013-10-16 17:24:59 +09:00
Yuichiro Hanada
7b5f2b71f5
Fix Ver4DictDecoder.readAndFollowForwardLink().
...
Change-Id: Ib527a376b693be21aebd4920ac804ee9b161eb96
2013-10-16 17:16:26 +09:00
Ken Wakasa
008d84ffa5
Merge "Fix readAndFollowForwardLink."
2013-10-16 07:48:30 +00:00
Ken Wakasa
6b7037fa68
Merge "Extract SparseTableContentWriter."
2013-10-16 07:34:03 +00:00
Satoshi Kataoka
47015f205a
Merge "Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString."
2013-10-16 07:33:21 +00:00
Satoshi Kataoka
612885f65b
Merge "Cleanup unintentionally used resources"
2013-10-16 07:06:16 +00:00
Satoshi Kataoka
af846af8bb
Remove Azerbaijani subtype
...
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 15:48:30 +09:00
Satoshi Kataoka
ba9a428627
Cleanup unintentionally used resources
...
bug: 11244796
Change-Id: I99be3d54d38f4cd70fc38f5e0b88b4027f62d579
2013-10-16 14:44:50 +09:00
Yuichiro Hanada
ed831f38db
Extract SparseTableContentWriter.
...
Change-Id: I9a58e53317654f8a09fbe79044214de3e9c59eb7
2013-10-16 09:53:30 +09:00
Yuichiro Hanada
1557de7aa4
Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString.
...
Change-Id: I6f990fd84e7f08fd1149198c33d8bbf1cac8e078
2013-10-16 00:30:45 +09:00
Yuichiro Hanada
522dc0d8ac
Fix readAndFollowForwardLink.
...
Change-Id: Ifda44e6139a4a1bd065468a7f74cd9483b343644
2013-10-16 00:16:39 +09:00
Ken Wakasa
b067be0e5f
Merge "Revert "Revert "Add Swiss French and German keyboard layouts."""
2013-10-15 14:12:29 +00:00
Ken Wakasa
b044047227
mExpectingUpdateSelection was out of sync when nothing to delete.
...
cherripick of I9c6a948331726a821bd3ccec9c1d02dec2c4703a
(forward cherrypicking this because the automerger is stuck now.)
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.
1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace
The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.
bug: 11181913
Change-Id: I1cbf444d8d105416e7de75c16d80b3797f470495
2013-10-15 14:05:34 +09:00
Ken Wakasa
34ad4e0879
am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.
...
* commit 'b9ce84214212f5b5072cd9fda458526887c3c739':
mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-14 19:49:12 -07:00
Ken Wakasa
cf5dfd2464
am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
...
* commit '3a3bbf4a38870ecc42b7f6fbd3a7cae20fe020a7':
Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-14 10:52:40 -07:00
Ken Wakasa
b9ce842142
mExpectingUpdateSelection was out of sync when nothing to delete.
...
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.
1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace
The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.
bug: 11181913
Change-Id: I9c6a948331726a821bd3ccec9c1d02dec2c4703a
2013-10-14 17:57:48 +09:00
Ken Wakasa
eed74b81a6
am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
...
* commit 'c8383eda8bb05e25b22fe6d66100248f7d0e33fa':
Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-13 16:24:47 -07:00
Ken Wakasa
c8383eda8b
Fix wrong commitText parameter in sendKeyCodePoint()
...
Small optimization on generating a String instance from a single code
point too.
bug: 11181913
Change-Id: I0f905e4dc6ec7841092bb4d3d940daf3b2303f5b
2013-10-13 10:56:10 +09:00
Baligh Uddin
9e4210ba3a
Import translations. DO NOT MERGE
...
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
2013-10-12 09:50:42 -07:00
Baligh Uddin
cdc4c1dca7
Import translations. DO NOT MERGE
...
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
2013-10-12 09:43:32 -07:00
Baligh Uddin
8f99107bbb
Merge "Import translations. DO NOT MERGE"
2013-10-11 15:35:33 +00:00
Baligh Uddin
40823338e2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-11 15:35:27 +00:00
Baligh Uddin
fc33cc6dba
Import translations. DO NOT MERGE
...
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
2013-10-11 06:35:24 -07:00
Baligh Uddin
02ecae3aa3
Import translations. DO NOT MERGE
...
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
2013-10-11 06:31:03 -07:00
Ken Wakasa
fe97ff4083
am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '60fb58654e33448651fea191ba22cfdc87e37466':
Make emoji separators
2013-10-11 05:10:21 -07:00
Satoshi Kataoka
eb7fa4dc6d
am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
...
* commit '405062733cfe066c4b9af719bfc36a9a516c9dd3':
Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:10:19 -07:00
Ken Wakasa
06e1bdaa25
am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
Make emoji separators
2013-10-11 05:05:11 -07:00
Satoshi Kataoka
ac6d0c656e
am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
...
* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4':
Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:05:09 -07:00
Ken Wakasa
3e35e0727c
Merge "Make emoji separators" into klp-dev
2013-10-11 11:57:07 +00:00
Satoshi Kataoka
6d91503727
Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
2013-10-11 11:53:07 +00:00
Jean Chalard
6fc15b9fc4
Fix a bug where emojis would remove the suggestion strip.
...
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
2013-10-11 20:51:13 +09:00
Jean Chalard
401fb908f0
Make emoji separators
...
Bug: 11163495
Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
2013-10-11 20:00:38 +09:00
Ken Wakasa
7abdab1c6f
Merge "Add a time stamp for unigrams."
2013-10-11 10:17:01 +00:00
Jean Chalard
3def959e4d
am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
...
* commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b':
Fix the suggestion size.
2013-10-11 01:49:51 -07:00
Jean Chalard
331c84d790
am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
...
* commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a':
Fix the suggestion size.
2013-10-11 01:43:29 -07:00
Jean Chalard
5fe9ab1cc6
Merge "Fix the suggestion size." into klp-dev
2013-10-11 08:38:31 +00:00
Ken Wakasa
be22a01df3
Merge "Add resolveBigramPositions."
2013-10-11 07:45:20 +00:00
Jean Chalard
c0bd0a244d
Fix the suggestion size.
...
The available space was not computed correctly. This makes the
decision to ellipsize/expand the middle suggestion correct.
Also, the scale was not applied correctly in some cases.
Finally, for some reason ellipsize does not work as we expect.
I'm not sure how to get it to work like we want it to, but
this works around the problem in a simple manner.
Bug: 11158757
Change-Id: I083e7ac56e157f100923733e67b92a6368a526c9
2013-10-11 16:42:46 +09:00
Satoshi Kataoka
ee1ff0da30
am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
...
* commit '7611af753af5ba112bcfc8c434caf88dc8f46325':
Do not merge. Save / restore the last used emoji category
2013-10-11 00:23:38 -07:00
Satoshi Kataoka
7611af753a
Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
2013-10-11 07:21:35 +00:00
Satoshi Kataoka
7d3f53a1cb
Do not merge. Save / restore the last used emoji category
...
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
2013-10-11 16:05:38 +09:00
Satoshi Kataoka
6026a95816
Merge "Save / restore the last used emoji category"
2013-10-11 07:04:42 +00:00
Satoshi Kataoka
6dc99dc200
Save / restore the last used emoji category
...
Bug: 11029983
Change-Id: I1bec2c3c6b547de68562a818a8d6c9fef83787b7
2013-10-11 16:00:33 +09:00
Yuichiro Hanada
c32962b8f1
Add a time stamp for unigrams.
...
Bug: 10920255
Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed
2013-10-11 15:08:09 +09:00
Yuichiro Hanada
9514ed5c2a
Add the new format of bigram entries.
...
In new format, each bigram entry has flags (1 byte), a terminal id (3 byte),
a time-stamp (4 byte), a counter (1 byte) and a level (1 byte).
Bug: 10920255
Bug: 10920165
Change-Id: I0f7fc125a6178e6d25a07e8462afc41a7f57e3e1
2013-10-11 14:50:41 +09:00
Jean Chalard
7e6ac9d727
Allow double-space-to-period after percent
...
Bug: 11158604
Change-Id: If8c94ef91ed58bb5028f51be7c8d9beb677436a4
2013-10-10 21:26:08 +09:00
Ken Wakasa
85dec741a7
am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
...
* commit '6dac27eeb4cfc969a07e646f013a25a27760c773':
Tweak vertical gap of Emoji palette. DO NOT MERGE
2013-10-09 21:25:50 -07:00