nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
14042 commits 1 branch 0 tags 363 MiB
Commit graph

7359 commits

Author SHA1 Message Date
Kurt Partridge
305509ed2f Merge "Remove unused method" 2013-05-29 01:36:27 +00:00
Kurt Partridge
b536e2ace5 Remove unused method 
The removed method was used in old versions of ALK, never in master.

Change-Id: I607009d4fcca7c7c8493fee51ecd923e6a6b3890
 2013-05-28 16:51:19 -07:00
Kurt Partridge
215fabff52 Merge "Rename containsCorrection to containsUserDeletions" 2013-05-28 23:41:26 +00:00
Kurt Partridge
315ab98007 Rename containsCorrection to containsUserDeletions 
This change renames containsCorrection to avoid confusion with
CorrectionInfo, and to better clarify its meaning.

Change-Id: I5d8f8e2b03133c15a60d4e8b0f395cda1fff5447
 2013-05-28 09:43:04 -07:00
Tadashi G. Takaoka
d99abf8cb1 Delete shared preference entry when user select default value 
Change-Id: I3fbafd9024c26a99d87376f5d5e359e03988a30f
 2013-05-28 20:44:25 +09:00
Tadashi G. Takaoka
39bd6ea0dc Merge "Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs" 2013-05-28 11:40:10 +00:00
Tadashi G. Takaoka
dbed20ad8d Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs 
Change-Id: I16e3f3ebc43772cfd96c824afeddfd225404b857
 2013-05-28 20:23:37 +09:00
Tadashi G. Takaoka
d69e4191b7 Merge "Refactor suggestion strip layout methods a bit" 2013-05-28 11:11:05 +00:00
Tadashi G. Takaoka
389d308fff Refactor suggestion strip layout methods a bit 
Bug: 9059710
Change-Id: I8dc698c1d61ca51b65b232e6c586472588a4accb
 2013-05-28 20:03:37 +09:00
Tadashi G. Takaoka
4c2ac9ee5f Merge "Rename commaConcatinatedText to commaSplittableText" 2013-05-28 10:58:16 +00:00
Tadashi G. Takaoka
c47bc30db8 Rename commaConcatinatedText to commaSplittableText 
This is a follow up of I5a32882a08.

Change-Id: I9f0cda2167811f6bba2af042fbde0a821b4cfecd
 2013-05-28 19:17:15 +09:00
Tadashi G. Takaoka
68cf2cd931 Merge "Check all regexp patterns in ResourceUtils.getDeviceOverrideValue" 2013-05-28 10:13:43 +00:00
Keisuke Kuroyanagi
e168a3c2a5 Merge "Adding additional feature settings." 2013-05-28 10:11:29 +00:00
Tadashi G. Takaoka
4c75ea858a Check all regexp patterns in ResourceUtils.getDeviceOverrideValue 
This change also fixes a regexp error of Galaxy S III.

Change-Id: I42a4780bbfd2b083f4e27e61ec513aa875907344
 2013-05-28 19:05:40 +09:00
Tadashi G. Takaoka
6d77ae9d81 Merge "Remove KeyboardStart.isInMomentarySwitchState" 2013-05-28 09:23:24 +00:00
Satoshi Kataoka
07e56e76a7 Merge "Implement KIND_OOV_CORRECTION" 2013-05-28 07:27:53 +00:00
Keisuke Kuroyanagi
1b100610b3 Adding additional feature settings. 
Change-Id: I9fec0c03b7da9ce0305b494193f4cfe3fca144f3
 2013-05-28 00:27:48 -07:00
Tadashi G. Takaoka
1b46738796 Rename "csv" in StringUtils to "commaConcatenatedText" 
Change-Id: I5a32882a088e4ff5bfe973a86465d6ff839113d9
 2013-05-28 16:13:36 +09:00
Tadashi G. Takaoka
e7e7b3234c Remove KeyboardStart.isInMomentarySwitchState 
Change-Id: I00f45d8dd7feb6c34c0a65a8545cddd2751796d0
 2013-05-28 15:26:03 +09:00
Satoshi Kataoka
3d97b95b90 Implement KIND_OOV_CORRECTION 
Bug: 9127749
Change-Id: I96db15a3138e6b522c4c6ad16cc7faad577d3772
 2013-05-27 18:53:43 -07:00
Satoshi Kataoka
c92e87faf3 Add smoothing utils / matrix libs 
Bug: 8556775
Change-Id: I7e0516b344937b84b7d57cc4e5009b7f88e7dc98
 2013-05-27 18:08:49 -07:00
Baligh Uddin
b4a1c2b510 Import translations. DO NOT MERGE 
Change-Id: I1f9b5cf9010256f04a132bb832c128174251d726
Auto-generated-cl: translation import
 2013-05-27 15:20:20 -07:00
Baligh Uddin
dee9d17c68 Import translations. DO NOT MERGE 
Change-Id: Iccfbe700901fe89974beab377bea82d547a1478a
Auto-generated-cl: translation import
 2013-05-27 15:08:39 -07:00
Tadashi G. Takaoka
2115f63cba Merge "Add contentDescription attribute to setup wizard video and image" 2013-05-24 22:28:36 +00:00
Keisuke Kuroyanagi
28b6262b54 Merge "Passing options to native suggestion method." 2013-05-24 22:27:19 +00:00
Tadashi G. Takaoka
740d829092 Merge "Use localized toLowerString in AutoCorrection.isValidWord" 2013-05-24 20:00:38 +00:00
Tadashi G. Takaoka
94027c7201 Use Locale.ROOT for locale neutral operations 
Bug: 9112465
Change-Id: I6cd63007287b5a1a57cfbabff35d53f66fc5620e
 2013-05-24 12:07:30 -07:00
Tadashi G. Takaoka
618407ab7e Use localized toLowerString in AutoCorrection.isValidWord 
Bug: 9112465
Change-Id: I63eb4115f393444560e80220d4c90f0f7101b934
 2013-05-24 11:47:36 -07:00
Tadashi G. Takaoka
ebe0544fc8 Remove redundant method AutoCorrection.isInTheDictionary 
Change-Id: I0737fb0b68f411f4db06014f2d94804935808922
 2013-05-24 11:40:03 -07:00
Tadashi G. Takaoka
b2a78977ba Add contentDescription attribute to setup wizard video and image 
Bug: 9112276
Change-Id: I028371770bacd6d975dee5648230abc19f51f542
 2013-05-24 11:13:21 -07:00
Keisuke Kuroyanagi
50db5f0fff Passing options to native suggestion method. 
Change-Id: I6da180cfa1b9e5aa39600e78e3bc41209a40f583
Signed-off-by: Keisuke Kuroyanagi <ksk@google.com>
 2013-05-24 10:21:04 -07:00
Kurt Partridge
df8f0fb64b Merge "Fix layout" 2013-05-24 16:09:24 +00:00
Kurt Partridge
c4fe29425c Merge "Fix misplaced xml namespace" 2013-05-24 13:54:46 +00:00
Kurt Partridge
89c66fc12e Fix layout 
Children of ScrollViews should specify a wrap_content layout_height,
according to AndroidLint

Change-Id: I4f972535f0df6bda1ba48082b812ce80fb5cfdcc
 2013-05-23 17:59:23 -07:00
Kurt Partridge
003ed9b36a Fix misplaced xml namespace 
Change-Id: I891293c10afbbee0a73c7c98322bec248cc7afb3
 2013-05-23 17:59:23 -07:00
Kurt Partridge
264fb9581c Merge "Log reasons for punting n-gram logging" 2013-05-24 00:19:24 +00:00
Tadashi G. Takaoka
02088f4497 Add vibration override values for Galaxy S4 and HTC One 
Bug: 9109493
 2013-05-23 17:03:42 -07:00
Kurt Partridge
aaa23bc12c Log reasons for punting n-gram logging 
Addresses b/9074239

Change-Id: I91a3bfcbd32b03e4891ff5f65be01383a3fb8975
 2013-05-23 13:56:36 -07:00
Tadashi G. Takaoka
6f9105383a Remove unnecessary methods of KeyboardSwitcher 
Change-Id: Idd3647bb1a1d40df8bb89eda715d45427a58d0cd
 2013-05-22 10:49:53 -07:00
Tadashi G. Takaoka
dc22b7226a Merge "Clean up unused return value" 2013-05-22 17:44:51 +00:00
Tadashi G. Takaoka
d88353266a Merge "Haptick and audio feedback on key repeat" 2013-05-22 17:44:01 +00:00
Kurt Partridge
5fdea4775e Merge "Always record word boundaries" 2013-05-22 03:04:35 +00:00
Tadashi G. Takaoka
009488eaaf Haptick and audio feedback on key repeat 
Bug: 6522943
Change-Id: I181f7e8722bf1b3042d7f384ae8ebf87f29458a9
 2013-05-21 19:48:15 -07:00
Tadashi G. Takaoka
d9a87eb857 Merge "Fix drawing debug points of gesture trails" 2013-05-22 00:39:22 +00:00
Keisuke Kuroyanagi
44f679bbd2 Merge "Fix running on device regression test and profile." 2013-05-22 00:18:14 +00:00
Tadashi G. Takaoka
96efb1252a Clean up unused return value 
Change-Id: Ie59f08db947ca5314935c6b723cf498129b4515c
 2013-05-21 16:42:07 -07:00
Tadashi G. Takaoka
9764397274 Fix drawing debug points of gesture trails 
Bug: 7167303
Change-Id: I9a75b1b9b9127c5364da49b2a04b22c16a7ad535
 2013-05-21 16:09:10 -07:00
Kurt Partridge
450d78b030 Always record word boundaries 
Word boundaries are currently logged, but only if all the
details of a word pass the privacy filter and are logged.

This change records when a word is committed in all cases,
but does not disclose the word contents or any data used in
its construction.

Addresses b/9070768

Change-Id: I573679d0685c088aca65af99e46337a2f429f816
 2013-05-21 16:08:54 -07:00
Tadashi G. Takaoka
8a6a15e052 Merge "Clean up IntentCompatUtils a bit" 2013-05-21 22:17:24 +00:00
Tadashi G. Takaoka
db7d4da3e5 Clean up IntentCompatUtils a bit 
Change-Id: I803aa6c2160bfa1ffe992b28e7eb6e8a320c9762
 2013-05-21 15:13:23 -07:00
Kurt Partridge
ff80ee20b4 Merge "Modify isAllowedToLog" 2013-05-21 21:22:23 +00:00
Kurt Partridge
74a6196c6b Modify isAllowedToLog 
Currently isAllowedToLog only checks the state of the
ResearchLogger, and does not consider which log the data is
going to.  This causes problems with the logs for Feedback.
The Feedback log should inhibit normal logging procedures,
but the system needs to be able to write specific data
directly to it.

This change renames to isAllowedToLogTo and adds the
destination ResearchLog as a parameter.  A FeedbackLog is also
added as a new class so it can be distinguished from other
ResearchLogs.

Change-Id: I5a1eea05bb040c26bf816b89179f44b3024fa2ad
 2013-05-21 14:09:04 -07:00
Jean Chalard
d96f63d2ed am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev 
* commit 'e2bee5b134aaefc69a680be8ea65e2d7640b3ead':
  Fix a crash on a secondary user
 2013-05-20 21:32:21 -07:00
Jean Chalard
e2bee5b134 am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev 
* commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c':
  Fix a crash on a secondary user
 2013-05-20 21:29:50 -07:00
Jean Chalard
ede3db51f0 Merge "Fix a crash on a secondary user" into jb-mr2-dev 2013-05-21 04:27:34 +00:00
Baligh Uddin
13d7d5684e am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '23bff513a97a71eacc6eadf694ce6f5a1e07967c':
  Import translations. DO NOT MERGE
 2013-05-20 21:19:11 -07:00
Baligh Uddin
7f008a62d3 Merge "Import translations. DO NOT MERGE" 2013-05-21 04:18:40 +00:00
Baligh Uddin
23bff513a9 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-21 04:17:27 +00:00
Jean Chalard
05ea7c5d02 am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection 
* commit '167ba3459b0ce02b9add12ade9388bd2b1e6eb62':
  Add a method to work around apps broken by recorrection
 2013-05-20 21:10:07 -07:00
Jean Chalard
167ba3459b am 89fe1f50: Add a method to work around apps broken by recorrection 
* commit '89fe1f50881180730e451cbe6ec4d1f8dc67acf1':
  Add a method to work around apps broken by recorrection
 2013-05-20 21:08:41 -07:00
Satoshi Kataoka
10e8b93977 Fix a crash on a secondary user 
Bug: 9054063
Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
 2013-05-21 12:27:16 +09:00
Keisuke Kuroyanagi
adf82a97a9 Fix running on device regression test and profile. 
Change-Id: Ie16d9514092d6d6f42881b975420e5d1431b776c
 2013-05-20 20:14:13 -07:00
Tadashi G. Takaoka
a66396369b Merge "Remove unnecessary @UsedForTesting annotation" 2013-05-21 03:07:59 +00:00
Jean Chalard
0013f97ddd am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds. 
* commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc':
  Extract a new class for app-specific workarounds.
 2013-05-20 19:50:46 -07:00
Jean Chalard
5906b05bb5 am 7058b02a: Extract a new class for app-specific workarounds. 
* commit '7058b02a9c798c21b169b778be2befc7739f4e9b':
  Extract a new class for app-specific workarounds.
 2013-05-20 19:49:25 -07:00
Tadashi G. Takaoka
2532f72b94 Remove unnecessary @UsedForTesting annotation 
Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
 2013-05-21 10:45:59 +09:00
Jean Chalard
89fe1f5088 Add a method to work around apps broken by recorrection 
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
 2013-05-21 07:53:31 +09:00
Jean Chalard
7058b02a9c Extract a new class for app-specific workarounds. 
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
 2013-05-21 07:53:28 +09:00
Baligh Uddin
5914b8d4b6 Import translations. DO NOT MERGE 
Change-Id: I1075741837c63b5bb93cf2b39aa707cf5afeb9e7
Auto-generated-cl: translation import
 2013-05-20 15:29:34 -07:00
Baligh Uddin
6ac1a79f02 Import translations. DO NOT MERGE 
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
 2013-05-20 15:15:36 -07:00
Kurt Partridge
500dea6ad4 Fix punctuation logging 
Punctuation is currently put into the same LogUnit as the
following word.  This is counter-intuitive and makes
post-processing more complicated.

This change causes punctuation to be put into its own
LogUnit.

A tricky case is the phantom space.  A phantom space is
inserted right before other text, whose MotionEvents have
already been collected and inserted into mCurrentLogBuffer.
Phantom spaces are handled by creating their own LogUnit and
inserting it into the LogBuffer right before
mCurrentLogBuffer is shifted in.

Change-Id: I102d7cd93982ad37ba0abb6c1ac0f66b85b5f95d
 2013-05-17 09:47:40 -07:00
Kurt Partridge
17b63ba588 Merge "Remove unnecessary commit/uncommit" 2013-05-15 23:52:43 +00:00
Kurt Partridge
7af5300c7d Merge "Add claifying comment" 2013-05-15 23:31:31 +00:00
Jean Chalard
d40b4729a5 am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown" 
* commit 'b1e37e4a478a577c59930767148e50f8f45af21f':
  am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
 2013-05-15 12:59:27 -07:00
Tadashi G. Takaoka
ff0bd7dbfa am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change" 
* commit '25f0c8089eecfcded7f41c66453bd874ba92219a':
  am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
 2013-05-15 12:59:26 -07:00
Tadashi G. Takaoka
d6a7a26d63 am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard" 
* commit 'd59c1f8324d568fa05a0ba660c602357b8f68958':
  am 50259c70: Merge "Tune layout parameters of setup wizard"
 2013-05-15 12:59:25 -07:00
Tadashi G. Takaoka
e7ef9669d6 am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset) 
* commit '7d9bd6f54e5ebed4b4a1657c44e5731a2d182560':
  am 66b87269: Update welcome fallback image (using xhdpi asset)
 2013-05-15 12:59:23 -07:00
Tadashi G. Takaoka
883905f45b am 7fe67544: am 769427cf: Adjust aspect ratio of setup image 
* commit '7fe675440e5ecc3da872803dae60bec8bd66c9e5':
  am 769427cf: Adjust aspect ratio of setup image
 2013-05-15 12:59:22 -07:00
Kurt Partridge
39afaf3dc3 am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables." 
* commit '6d0f0347013fbd59d967b438c9f2754141d35f85':
  Remove FeedbackLog instance variables.
 2013-05-15 12:59:19 -07:00
Tadashi G. Takaoka
46bf9f493c am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image" 
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
  Revise welcome screen video and still image
 2013-05-15 12:59:17 -07:00
Ken Wakasa
acb37023b2 am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit." 
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
  Adjust sampling interval for gesture stroke drawing a bit.
 2013-05-15 12:59:11 -07:00
Ken Wakasa
5ee11c5d9a am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden"" 
* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"
 2013-05-15 12:59:09 -07:00
Tadashi G. Takaoka
8e7b173936 am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input 
* commit '3fff5179d5020123c5bae7a1c83591afd45ace58':
  Back to previous keyboard layout by canceling sliding input
 2013-05-15 12:59:08 -07:00
Tadashi G. Takaoka
03f2ca6d50 am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan" 
* commit 'f46eafe2555a8d405ce7171bc4a2977a9aecf2b9':
  Fix PointerTrackerQueue.releaseAllPointerOlderThan
 2013-05-15 12:59:06 -07:00
Jean Chalard
95586abc11 am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden 
* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
  Fix isSuggestionsStripVisible when keyboard hidden
 2013-05-15 12:59:05 -07:00
Tadashi G. Takaoka
2d86b73ffe am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds 
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
  Tune maximum keypress duration to 100 milliseconds
 2013-05-15 12:53:14 -07:00
Tadashi G. Takaoka
7e52c35dce am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X" 
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
  Fix keypress vibration duration of HTC One X
 2013-05-15 12:53:13 -07:00
Tadashi G. Takaoka
f197335027 am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode" 
* commit 'a70da988d78ffd20941dfaa34f7a6324e465808e':
  Disable functional key while in sliding input mode
 2013-05-15 12:53:11 -07:00
Tadashi G. Takaoka
c731457f8a am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database 
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
  Add device specific keypress vibration duration database
 2013-05-15 12:53:10 -07:00
Tadashi G. Takaoka
73673b4c41 am f1708394: am 0efd8d1b: Fix landscape override value expression 
* commit 'f17083941daefe146358dc39a3e8d0ca660c530d':
  Fix landscape override value expression
 2013-05-15 12:53:09 -07:00
Tadashi G. Takaoka
7a876b3114 am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode" 
* commit '813ba9f5262c59ba99efdcf838036ae3b7e2dd0c':
  Disable long press timer while sliding input mode
 2013-05-15 12:53:07 -07:00
Tadashi G. Takaoka
94ad2ef762 am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode 
* commit '094447bd4652f9ed038f0489ef4e4f5af1679143':
  Disable delete key repeating while in slide input mode
 2013-05-15 12:53:06 -07:00
Tadashi G. Takaoka
66e5e05fbf am 6780e43d: am 18184eac: Support regular expression for condition pattern 
* commit '6780e43d761b0cbe0ce54cfc017ac779509e1c61':
  Support regular expression for condition pattern
 2013-05-15 12:53:04 -07:00
Tadashi G. Takaoka
aaf7d70be7 am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue" 
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
  Support multiple condition for getDeviceOverrideValue
 2013-05-15 12:53:03 -07:00
Ken Wakasa
8738eeaf65 am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java 
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
  Rename GesturePreviewTrail.java -> GestureTrail.java
 2013-05-15 12:53:02 -07:00
Kurt Partridge
7bc99237b3 am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error 
* commit '03a32146458f3cd192fde2ff0e85e3a0271a7d2a':
  Avoid JsonWriter multi-write error
 2013-05-15 12:53:00 -07:00
Kurt Partridge
1e0f8cffaf am 697f6abb: am 260df841: Merge "Remove unused code" 
* commit '697f6abb5d6478e0e0493ee7f821522fa4411f18':
  Remove unused code
 2013-05-15 12:52:59 -07:00
Kurt Partridge
eaf5c22782 am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference." 
* commit '026b2645c8561b554aa4f127bc90f4805354dc7d':
  Remove ref to LatinImeLogger preference.
 2013-05-15 12:52:57 -07:00
Kurt Partridge
4ee6df8d6e am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization" 
* commit '1f8b354c9e30963f48ddf6c08b9333bcdc0e0a6f':
  Avoid NPE by fixing ResearchLogger initialization
 2013-05-15 12:52:56 -07:00
Tadashi G. Takaoka
941e8bbaa9 am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey" 
* commit 'a01ab9ea3580d95e87f3357b2612fb84971b3bfd':
  Refactor StringUtils.findPrefixedString to findValueOfKey
 2013-05-15 12:52:55 -07:00