Commit graph

8239 commits

Author SHA1 Message Date
Chieu Nguyen
7674a65367 Unicode 8.0 emoji additions to Google Keyboard.
Squashed commit of the following:

    commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Tue Nov 10 11:29:44 2015 -0800

        Remove check for version code.
        This was unnecessary and caused multi-codepoint
        emoji to not show up on any device.

        Bug: 25369504
        Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

    commit 4a4a042072790b19048a14d2ddab655b1be31a6e
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Sun Nov 1 18:38:20 2015 -0800

        Add description strings for Unicode 8.0 new emoji.

        Bug: 16185905
        Bug: 25369504

        Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17

Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
2015-11-11 11:04:45 -08:00
Ian Pedowitz
e1d5012683 Revert "Unicode 8.0 emoji changes to Google Keyboard."
This reverts commit 9cc42549d1.

Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
2015-11-10 03:29:41 +00:00
Chieu Nguyen
9cc42549d1 Unicode 8.0 emoji changes to Google Keyboard.
Squashed commit of the following:

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
2015-11-06 18:22:05 -08:00
Dmitry Torokhov
28e65858d9 Do not start in recents tab if we do not have recent emojis
If user has not used emojis we should not bring recents emoji tab on the
first invocation of the on-screen keyboard as it is confusing to see an
empty tab.

We will still be showing recents tab even if it is empty if user
actively switched to it when using on-screen keyboard.

Bug: 24497650

Change-Id: I68b4bf64441590858d246168cc4733a2875a1357
(cherry picked from commit 24d67eba27cb23c0d3aca44236247ec12380daa5)
2015-10-15 12:47:32 -07:00
Dan Zivkovic
1fdb8f3156 Define shortcuts for toggling IME layouts.
Out of the box, we want Alt-Left to toggle Emojis, while Alt-Right
toggles the shifted symbols layout.

Bug: 23954008
Bug: 24369173

Change-Id: I93dd66fb469e5d0a831359ff3a786fe68e1d73ea
(cherry picked from commit 411841b374aa04e333ea5a438dfd539f49ec589a)
2015-10-15 12:47:32 -07:00
Dan Zivkovic
de674ac02e Re-activate emoji keyboard shortcut.
Bug 23900149.

Change-Id: Iff8a3892bb88f82736e5fa680c38d98cda4d2777
(cherry picked from commit e1641395e30de7b53b06fc5c820ea83bf04b3aad)
2015-10-15 17:14:04 +00:00
Russell Brenner
f52bae1805 Don't show download toast during SUW
Check to see if setup wizard is running before showing toast to
inform user that a download was started. Note that this will only
affect the device owner; when adding new users later, the toast
will still appear. (The USER_SETUP_COMPLETE flag is hidden from
the SDK, while DEVICE_PROVISIONED remains available.)

Bug: 22594336
Change-Id: I57c42d6f821714b71cbb066e82bba2a1dbab4951
2015-08-25 17:39:00 +00:00
Mohammadinamul Sheik
b0dd5cc7b2 Fix the ellipses image scaling of LatinIME
Bug: 23082844
Change-Id: I7baac5e5a0700280906fd0f5f9351fc8dfc4c2b3
(cherry picked from commit 990e9a75b6d88ba234131612f11eac6b69c1cf84)
2015-08-12 18:03:44 +00:00
Mohammadinamul Sheik
707ca7692a Handle Cloud Sync and SpellChecker settings when permission changed
This build has been compiled against API 23

This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps

Version: 4.1.2300x.build_id


1. Disable the settings.
2. Disable the feature.
3. Force reload the facilitator.

Bug: 22564048
Change-Id: Ic09742786c3e4efc034bceee836ae6a1e07307a1
(cherry picked from commit 031d04192080f0368f21c3371d1ec6af87375357)
2015-07-24 02:00:54 +00:00
Mohammadinamul Sheik
604158669b [LatinIME] Support MNC permissions.
This build has been compiled against API 23

This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps

Version: 4.1.2300x.build_id

1. Replaces the personalization is on information with the suggest
   contacts.
2. Enables "Use Contacts" only if the app has permission to read
   contacts.
3. Disables the contacts dictionary in the Facilitator.
4. Do not register/read the contacts in the contact observer.

Bug: 22236416
Change-Id: I9674e13d0d0f4a2014c5024fde0178de684c07e7
2015-07-15 22:51:53 +00:00
Jatin Matani
d711426a87 Remove android.util.Log from FileUtils
FileUtils is being used for other non android projects
and hence breaks when built. Instead use the log statements
at caller to record Log.e messages. Hence there is no side
effect here.

Bug:22042371
Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2
2015-07-09 11:50:10 -07:00
Jatin Matani
8c2591eec8 Bring back shortcuts and add to dictionary UI
For JB and lower devices, the UI is surfaced by the IME.
Bug: 22200135
Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e
2015-07-06 17:32:13 -07:00
Dan Zivkovic
d23dd5978d Don't prompt before downloading.
We don't pay attention to the answer, so don't ask.

Bug 22069694.

Change-Id: Ic048d5570e68fbc9438c6577e27e6c7f68428606
2015-06-25 15:01:04 -07:00
Dan Zivkovic
5e4c0caac3 Add some more logging. Why not.
Change-Id: I536212e1b3c35d75ed93f9ab3762908e3deb9a97
2015-06-24 18:56:48 -07:00
Dan Zivkovic
3aad142435 Load metadata.json from resources on DB reset.
This will ensure that a new (or upgraded) keyboard instance will know which
dictionaries are available for download so it requests missing dictionaries.
In addition, we increment the database version number to ensure upgrades of
existing Fava instances start with a clean slate.

Bug 22069694.

Change-Id: Id71310412682543a3931f9c5c03cb0369fa7b9ac
2015-06-24 18:40:34 -07:00
Tom Ouyang
c32389ce11 Merge "Small optimization to eliminate a >0 check in RichInputConnection." into jb-ub-latinimegoogle 2015-06-24 19:44:37 +00:00
Tom Ouyang
96640a110b Small optimization to eliminate a >0 check in RichInputConnection.
Change-Id: Ibdf97726008c1f94c970461196ba445ce328a8cb
2015-06-24 12:00:04 -07:00
Dan Zivkovic
563d7935a9 Extend laggy connection timeout for initial load.
The initial reloadTextCache() operation needs to read 1k characters, and it
could be slow on low-end devices. Also, the initial load is not blocking key
strokes, so it can take a little longer.

Bug 22062102.

Change-Id: I134424e8910c0d6131c311a862bdc87eccd3af44
2015-06-24 11:57:59 -07:00
Dan Zivkovic
ecea6a6113 Merge changes Iaed8abfb,I8e55b57c into jb-ub-latinimegoogle
* changes:
  LatinIME portion of StatsUtil change.
  Do not decorate committed spans.
2015-06-23 20:55:23 +00:00
Tom Ouyang
67eaf613f7 Merge "Workaround for preserving responsiveness on a slow InputConnection." into jb-ub-latinimegoogle 2015-06-23 20:35:09 +00:00
Tom Ouyang
912016b69f Workaround for preserving responsiveness on a slow InputConnection.
1. Add mechanism to detect a slow or non-resonsive InputConnection (IC)
2. When IC slowness is detected, skip certain IC calls that are known
   to be expensive (e.g., getTextAfterCursor).
3. Similarly, disables learning / unlearning on a slow IC.
4. IC slowness flag is reset when starting input on a new TextView or
   when a fixed amount of time has passed.

Note: These are mostly temporary workarounds. The permanent solution is
to refactor RichInputConnection so that it is less sensitive to IC
slowness in general.

Bug: 21926256
Change-Id: I383fab0516d3f3a8e0f71e5d760a8336a7730f7c
2015-06-23 10:34:44 -07:00
Dan Zivkovic
ee6de1466b Do not decorate committed spans.
Users rarely tap on committed words, and the cost of sending the spans back
through the input connection, back and forth to the target app, is too high.

Bug 21926256.

Change-Id: I8e55b57ce2148ed313dc927425b6d9c958634958
2015-06-23 10:25:58 -07:00
Dan Zivkovic
4e9d260826 Do not force downloads on package replace.
This is causing issues we can't deal with in a safe and timely manner.
Furthermore, users who need downloaded dictionaries already have them by now.

Bug 21797386.

Change-Id: I97e5fd84edcf2b16f04db57b7ae4a13fa9ce993f
2015-06-23 10:15:34 -07:00
Mohammadinamul Sheik
bf7c0106b0 Fix the previous downloads logic to not missing any downloads.
Bug: 21797386
Change-Id: Ic09698b28e31b4f16831898d7cb08853f4e5df4a
2015-06-22 20:23:27 -07:00
Dan Zivkovic
73aaf68337 Detection and logging of slow input connections.
Also adds a hook to log using StatsUtils.
Proto change is coming in a separate CL.

Bug 22010482.

Change-Id: I08065fc7a5cd116e50ff84cb14bbbc44c4f14bc7
2015-06-22 17:36:53 -07:00
Mohammadinamul Sheik
5a51e4a0a8 Clear/remove all the scheduled downloads in Download Manager
Bug: 21797386
Change-Id: I60f50a2fe890af46f5e847c34df2edf719d40ac4
2015-06-22 12:57:31 -07:00
Chieu Nguyen
779d4bb429 Disable download notifications.
Change-Id: I25263fe227ae88afa2021454b0dac2b0c7b9bfe0
2015-06-19 21:52:20 -07:00
Dan Zivkovic
0232e73dfa Cleanup before fixing getTextAfterCursor().
We never delete text after the cursor, so constrain the API accordingly.
Define the number of characters to read before and after.
Set them to reasonable values.
The next CL will start caching text after the cursor.

Bug 21926256.

Change-Id: Idd58daf68614de4a69344aa3c8a4323720c5d3a0
2015-06-19 12:06:18 -07:00
Dan Zivkovic
02c28453fc Do not restrict downloads to WiFi networks.
Bug 21900337.

Change-Id: I82991b492ea4c02a28a1ccc898d6f12741f1b793
2015-06-17 12:53:55 -07:00
Dan Zivkovic
764a18cd92 Revert "Remove "Personal dictionary" link from settings."
This reverts commit 76de0a8f52.

Bug 21881199.

Change-Id: I53f42a1e8f25d214de97264f4d25813bc637cafa
2015-06-16 18:26:02 -07:00
Mohammadinamul Sheik
94b4ffa17a Merge "Hide Notification when downloading the keyboard metadata" into jb-ub-latinimegoogle 2015-06-16 00:23:02 +00:00
Mohammadinamul Sheik
851a8b5489 Hide Notification when downloading the keyboard metadata
Bug: 21797386
Change-Id: Iebe9d2f18c5c8325a5601d49d8c4c65166b67036
2015-06-15 16:04:43 -07:00
Dan Zivkovic
a9c235b533 Change metadata fetch interval back to 4 days.
Bug 19774872.

Change-Id: Icd790414d9462ee74a7eac11dd255fddf3048dce
2015-05-28 13:29:10 -07:00
Dan Zivkovic
7891733c73 Remove dogfood history reset.
Change-Id: I1d7ebe5962fc3176c376e1ce34c7ac98cdf41373
2015-05-21 10:24:15 -07:00
Dan Zivkovic
0e15ff6b48 Fix on-commit bug in AOSP keyboard.
Bug 21272977.

Change-Id: Id561040c29a7f2576cd9ef0514c31751a4360ef8
2015-05-19 10:45:19 -07:00
Mohammadinamul Sheik
b08f434482 Make the DictionaryService check for download every day.
Bug: 20103664
Change-Id: Iba019d5f79f46c560171e0594c2b5114b477923a
2015-05-12 13:49:35 -07:00
Mohammadinamul Sheik
44caf52581 Merge "clean up debug tags." into jb-ub-latinimegoogle 2015-05-12 20:46:29 +00:00
Mohammadinamul Sheik
142294a9fe clean up debug tags.
Change-Id: I2ca37bd691abcc036ead8071045d37d72b2d088d
2015-05-12 10:46:12 -07:00
Dan Zivkovic
f7a8edba2f Merge "Update the DB version." into jb-ub-latinimegoogle 2015-05-08 19:28:55 +00:00
Dan Zivkovic
f4590b0e28 Update the DB version.
Bug 20103664.

Change-Id: I1e2b72979df148d8aa71e3e58437a5853e63c261
2015-05-08 12:25:47 -07:00
Jatin Matani
e09da0aeb9 Set syncAutomatically for sync users
Note: this doesn't mean that sync would happen.
It only unblocks users who are already opted into
cloud sync

Change-Id: I91836efadac89d0429d7f2e9c9190a873a638743
2015-05-07 20:52:34 -07:00
Dan Zivkovic
bdc55e77f7 Metadata URI does not need additionalId.
Bug 20701628.

Change-Id: Ifba1e7dd7f9934c8c13279dfb95bf02c0e30e650
2015-05-06 09:30:47 -07:00
Dan Zivkovic
9bad1ac33f Look up thresholds during decoder reset.
Bug 20701628.

Change-Id: I4de89587776a0859aeda5d2ed76ab1eb4f918458
2015-05-04 14:48:28 -07:00
Mohammadinamul Sheik
f01cd568f0 Merge "Make the DictionaryService stage the downloaded files" 2015-05-04 19:04:15 +00:00
Mohammadinamul Sheik
a0d9c82921 Make the DictionaryService stage the downloaded files
Bug: 20641948
Change-Id: I6639c995b12c033bc30241cd219201dd483ee516
2015-05-04 11:57:31 -07:00
Dan Zivkovic
f22571e2d9 Delete history on upgrade in LatinIME.
Bug 20733902.

Change-Id: Ibe27e6cafe4db87ba62d7df708229e0d8564ffa8
2015-05-01 12:45:07 -07:00
Tom Ouyang
89f9070264 Do not learn from cursor corrections when autocorrection is disabled.
Bug: 20681528
Change-Id: I80e7095b70a151f3ccc36856d7e0837613a35972
2015-04-30 15:10:50 -07:00
Dan Zivkovic
459b4f353e Spelling cannot cache words across invocations.
We want to let the facilitator decide if a word is valid or invalid, and cache
the answer in the facilitator's cache. The spell checker session doesn't need
its own word cache, except as a crutch to communicate suggestions to the code
that populates the suggestion drop-down. We leave that in place.

Bug 20018546.

Change-Id: I3c3c53e0c1d709fa2f64a2952a232acd7380b57a
2015-04-29 14:30:49 -07:00
Chieu Nguyen
767c0bf71b Restore preference change update to show app icon setting.
Bug: 20544640
Change-Id: I6e2a26a8a5e43360dfefcc85bb46eae28f5e3867
2015-04-27 13:53:17 -07:00
Dan Zivkovic
784233dbc6 Specify fileName argument as Nullable.
Bug 20526371.

Change-Id: If53a81f925fbb1b29ad945ba0ec2192d92ae1eff
2015-04-23 14:12:33 -07:00