Commit Graph

83 Commits

Author SHA1 Message Date
Colin Cross
d6b79557ab widevine: support multilib builds
Support builds for multiple architectures the same time:
Use LOCAL_MODULE_TARGET_ARCH to restrict building to specific arches
Use LOCAL_C_INCLUDES_x86 to set the include path for only x86 builds

Change-Id: I7c33c27f1c9bfb6e3318a07514698992482f6cd7
2014-02-20 12:48:45 -08:00
John "Juce" Bruce
33a223dcf1 Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
Adds L1 x86 build of Widevine Classic that has been verified by partners.

Change-Id: Id85fea0e0311d06f0875a4aaedebaa9b00d17efa
2013-12-03 19:03:47 -08:00
John "Juce" Bruce
84b79eccb6 Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
Contains the following, BC-Triaged fixes:

Bug: 8767242
Media player error -1010 on playback

Bug: 8342523
Android Media player is able to play WVM content if license is
already acquired

Change-Id: I3ee7863a5bf214fb8c4e4aefdd05f5062d568617
2013-11-04 12:03:41 -08:00
John "Juce" Bruce
c9112ae31c Update 4.5.0.10098 of Widevine Classic Library
This CL replaces https://googleplex-android-review.git.corp.google.com/#/c/288483/
and adds the fix for error 408 preload timeouts due to badly configured IPv6
networks.

Bug: 8291064

Prefer IPv4 To Avoid Badly-Configured IPv6 Networks
https://widevine-internal-review.googlesource.com/#/c/5641/

The changes previously made on the AndroidOS_J branch, from
https://googleplex-android-review.git.corp.google.com/#/c/288483/
are:

Change name of DNS Server For Android Build
https://widevine-internal-review.googlesource.com/3322
(This is a no-op since the change to the android tree that
necessitated it was reverted.)

Update Build Script for Android
https://widevine-internal-review.googlesource.com/#/c/3340/

Fix Android OS Plugin Build on JB-MR2-DEV
https://widevine-internal-review.googlesource.com/#/c/5640/

Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551

Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390

Change-Id: Ia13d322d853e843fd26582fa72c38ff7c7bd59a6
2013-05-15 20:07:02 -07:00
Fred Gylys-Colwell
9477a252d3 Update Widevine Libraries Version 4.5.0.10088
This change updates the Widevine binary libraries.
It includes the change:
Turn on IPv6 Compatibility.
https://widevine-internal-review.googlesource.com/2242
bug: 7471810

Change-Id: I09beacb7853435f21c263e226a3dcaff74afbd2b
2012-11-09 12:50:44 -08:00
Jeff Tinker
aac6868830 Update Widevine Libraries Version 4.5.0.10087
This change updates the Widevine binary libraries.

It includes the change:
Correct error returned by ProcessDrmInfo
https://widevine-internal-review.googlesource.com/#/c/1870/

bug:7320744
Change-Id: Ic73a5dfa70140093224e9ce651947b224bdeccb9
2012-10-23 12:33:51 -07:00
Fred Gylys-Colwell
b1a1aa7b86 Update Widevine Libraries Version 4.5.0.10086
This change updates the Widevine binary libraries.

It includes the change:

Corrected error returned on timeout
https://widevine-internal-review.googlesource.com/1617

b/6758866

Change-Id: I81ac5d14823499b83a237406e7c5d345a15f6434
2012-10-02 13:43:35 -07:00
Fred Gylys-Colwell
59e30852dd Update Widevine Libraries Version 4.5.0.10085
This change updates the Widevine binary libraries.
It includes the change:
https://widevine-internal-review.googlesource.com/1400
Cleaned Up Locks and Removed Pause/Resume

bug: 6799914
Change-Id: I5e266e4d8bdc92e88e488d90aa5312ac740303b0
2012-09-28 18:11:34 -07:00
Fred Gylys-Colwell
845e53e684 Update Widevine Libraries Version 4.5.0.10082
This change updates the Widevine binary libraries.

It includes
https://widevine-internal-review.googlesource.com/1330
Add an argument to AcquireDrmInfo() for passing in the FD of an open file.

IMPORTANT: This change should be merge at the same time as these two:

https://googleplex-android-review.googlesource.com/226382
https://googleplex-android-review.googlesource.com/222797

bug: 7092908
bug: 6769768

Change-Id: I6931f9e4783234348ab384275fdc2ba374f6b591
2012-09-20 11:54:02 -07:00
James Dong
be20f24819 Revert "Update Widevine Libraries to Version 4.5.0.10079"
This reverts commit 8bbea70f79.

o related-to-bug: 7132419
2012-09-14 00:04:20 -07:00
Fred Gylys-Colwell
8bbea70f79 Update Widevine Libraries to Version 4.5.0.10079
Widevine Library for Level 1 and 3: Version 4.5.0.10079 AES 601_AndroidOS_J

This library has the following changes:

https://widevine-internal-review.googlesource.com/1320
Fix multicore synchronization issue in Pump.cpp

https://widevine-internal-review.googlesource.com/1343
Call OEMCrypto_Terminate in DRM Plugin After Setup. (JB MR1)

related-to-bug: 7078790
related-to-bug: 7092908
related-to-bug: 6769768
Change-Id: I4a03b60a1f030d710a2b2dd7f2a1ac3746ec846b
2012-09-06 19:25:05 -07:00
Fred Gylys-Colwell
b89b498f8a Update Widevine Libraries to Version 4.5.0.8008 and 8010.
Widevine Library for Level 1: Version 4.5.0.8008 AES 601_AndroidOS_J
Widevine Library for Level 3: Version 4.5.0.8010 AES 601_AndroidOS_J

Note: The current built procedure updates the minor version number separately for
the L1 and L3 libraries.  This will change in the near future.

This library includes the following changes:

https://widevine-internal-review.googlesource.com/1260
Remove Variable sAfterSeek for Release Builds

https://widevine-internal-review.googlesource.com/1228
Pause WVMK Session while seeking in order to remove race condition where data gets pulled

https://widevine-internal-review.googlesource.com/1143
Use closed-range HTTP GETs in ABR client.

https://widevine-internal-review.googlesource.com/1110
Ported ABR improvements from 6.0.0 as part of b/6500173. Changes as per Edwin's review.

Change-Id: I1e1fbda84a016356b3a1dbafd98c5d2e4935d505
related-to-bug: 6189953
related-to-bug: 6948238
related-to-bug: 6500173
2012-08-23 10:09:31 -07:00
Fred Gylys-Colwell
6a6c1522a9 Update Widevine Libraries to Version 4.5.0.8005 and 8007.
Widevine Library for Level 1: Version 4.5.0.8005 AES 601_AndroidOS_J
Widevine Library for Level 3: Version 4.5.0.8007 AES 601_AndroidOS_J

Note: The current built procedure updates the minor version number separately for
the L1 and L3 libraries.  This will change in the near future.

Log file from https://googleplex-android-review.googlesource.com follows:
----------------------------------------------------------------------
commit b26352bc14498a87178678a9cf02fb29733ec7fb
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Mon Aug 20 14:48:46 2012 -0700

    Update Version Number

    The official build script currently modifies the minor number and the major
    number, but does not yet modify the branch.  This is planned work. As a
    stop-gap measure, I changed this value by hand.

    I also modified the header file so that the version numbers may be modified on
    the command line with a -D instead of running a script that modifies the header
    file on the build machine.

    Change-Id: I2216600bf19ea6f268e711516d45f466b0d312da

commit 2334062773bbb32a3e0cab27770bd03cd8793c45
Merge: 429cc40 02ecdff
Author: Thomas Inskip <tinskip@google.com>
Date:   Mon Aug 20 11:30:55 2012 -0700

    Merge "Remove "Truncated File" warning at end of file." into RC/4.5.0/601_AndroidOS_J

commit 429cc4089c733f04785aaa09ed0b5d8fed76a567
Author: John Bruce <juce@google.com>
Date:   Fri Aug 17 14:36:06 2012 -0700

    Revert "Android has moved the NDK in their tree, so our Jamfiles need to be updated."

    This reverts commit d8e792ee61825b9090cec5f1096ba41fde7a5d7e

    Change-Id: I31470f0962591816f9a96b74866ca97c5e47ba38

commit d8e792ee61825b9090cec5f1096ba41fde7a5d7e
Author: John "Juce" Bruce <juce@google.com>
Date:   Wed Aug 15 19:01:30 2012 -0700

    Android has moved the NDK in their tree, so our Jamfiles need to be updated.

commit 02ecdff3dfcc93cac828bd973a41f33f067f9bcb
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Fri Aug 17 09:37:35 2012 -0700

    Remove "Truncated File" warning at end of file.

    Previously, when ExternalClient finds the end of file, it sets the
    error flag to mark the file as truncated.  This does not usually
    cause a problem, because errors at the end of file can be ignored.

    If we need to mark the file as truncated, we could either check that
    the length of the file is actually shorter than expected, or check
    that an end-of-stream marker has not already been added to the memory
    chunk queue.

    related-to-bug: 6635366 Could not terminate a DRM local playback session, probably due to -1004

commit a248147b0ca7db78dc42ba2e0c885044db97fe49
Author: John "Juce" Bruce <juce@google.com>
Date:   Wed Aug 15 12:31:58 2012 -0700

    Fixing references to renamed DIST variable in Jamfile for Android OS Plugin builds.

commit e251fff6623fab83ed2b052a0af3a1114d409f47
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Wed Aug 8 14:57:37 2012 -0700

    Updated Jam files so that android master is set at compile time.

    I replaced references to the /usr/local/android-master with the variable
    ANDROID_DIST so that it can be set at compile time.  The default is still
    /usr/local/android-master, so the change should be transparent.

    I changed DIST and ANDROID_MASTER both to be ANDROID_DIST in the Jam files
    so that there is only one variable with that meaning.

    I also updated the path for the loader script armelf.xsc.  This location is now
    specified in the main Jamrules file as ARMELF_PATH.

    Change-Id: I2d6945546198cdf3ab828346418bd4b07ea8c176

--------------------------------------------------------------------------------------------------

Change-Id: I99f445a44f0124c61532fdccfc8f620d10e15659
related-to-bug: 6635366
2012-08-21 14:18:42 -07:00
Edwin Wong
196fe01488 Add GetVersion API to query the client plugin version.
Includes Widevine libraries 4.5.0.8097

Change-Id: I7590d5a60f300f6686887f62ae127b86f76e6f94
related-to-bug: 6000505
2012-08-10 18:23:54 -07:00
Edwin Wong
e9f5431e78 Revert Widevine 6.0.0 -> 4.5.0 libraries
Includes Widevine libraries Version 4.5.0.7809

Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.

Change-Id: Ibcc6d313790670a908ada93be80d6bf55a67b4ed
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322
2012-08-03 13:33:58 -07:00
Jean-Baptiste Queru
c0fe913cec am 8af7a13b: Clarify ownership of widevine files.
* commit '8af7a13b611ecf0b19550ac6fef6e1c026daf63b':
  Clarify ownership of widevine files.
2012-06-19 07:25:37 -07:00
Jean-Baptiste Queru
8af7a13b61 Clarify ownership of widevine files.
Bug: 6611375
Change-Id: I1e9436716411db775c33d55cbd7dcb185bdc856d
2012-06-19 07:07:20 -07:00
Jeff Tinker
b07508ef01 Add support for crypto HAL on L3 devices DO NOT MERGE
Includes widevine library release version 4.5.0.7571

Change-Id: I9e574d5606576aab376d0524a4bf1a81e5a61678
related-to-bug: 6427322
related-to-bug: 6427274
2012-06-13 20:30:47 -07:00
Edwin Wong
e6513d5c7c Widevine library update 4.5.0.7570 DO NOT MERGE
This library release added more logging to print curl and tcp information
when the connection has stalled and download is restarted.

Change-Id: I02f3e96aa7adfdc577cbe25c32f7392f799fc954
related-to-bug: 6512768
2012-06-13 17:36:11 -07:00
Fred Gylys-Colwell
0d4ba36d4b Widevine library update 4.5.0.7514 DO NOT MERGE
This widevine library release allows the stream control library to
transition to the Done state from any other state.  Previously, it
would only transtion to Done from Playing.  This caused problem if
playback seeks to almost the end of the movie, and the end of stream
marker is read into a buffer before playback starts.

Change-Id: I9132094993fb35b0e93216845a29db46a9d07975
related-to-bug: 6635366
2012-06-12 17:11:12 -07:00
Jeff Tinker
a81f397c3e Widevine library update 4.5.0.7489 DO NOT MERGE
This widevine library release resolves an
intermittent problem with continuity counter
errors during HLS streaming.

Change-Id: Ie1009ed161daaf9c89bbdd56ac53105c51a35de0
related-to-bug: 6562375
2012-06-12 13:28:35 -07:00
Edwin Wong
7309379b9b Widevine library update 4.5.0.7443 DO NOT MERGE
Add logging to client for CACgi error 16; logging only occurs when error is encountered, b/6614495.
This version also includes the fix for spurious "data stopped arriving" messages, b/6512768.

Change-Id: I49e56dc1ab59abfb3037834a04748b0d5247aa50
related-to-bug: 6614495
related-to-bug: 6512768
2012-06-07 17:25:34 -07:00
Jeff Tinker
aae76100b9 Widevine library update 4.5.0.7394 DO NOT MERGE
Fixes dns resolution failures when multiple
name servers are defined.

Fixes the occasional CA CGI 16 error.

Change-Id: I3e68a7c9a01ae3caeb9473c90f021f56f7e1210b
related-to-bug: 6493657
related-to-bug: 6567835
2012-06-05 21:48:34 -07:00
Ying Wang
e36b59b8d3 Use board config variable BOARD_WIDEVINE_OEMCRYPTO_LEVEL
Instead of grepping out the oemcrypto level from PRODUCT_PACKAGES, which
is very fragile.

Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526
2012-06-05 14:29:27 -07:00
Jeff Tinker
43b8f70836 Widevine library update 4.5.0.7251 DO NOT MERGE
Resolves timeout issues on CDN redirect delays.
Includes the client side changes to support SD-only
playback on unlocked/rooted L2/L3 devices.

Change-Id: Id962e08b67e4d29bd22d254a4967c71891b504c9
related-to-bug: 6512768
related-to-bug: 6234558
2012-05-25 18:05:15 -07:00
Jeff Tinker
8b22e13988 Fix Widevine error reporting
Includes Widevine library version 4.5.0.7220

Change-Id: Iff9d98e0f168bee69226d5087dbeb20ec39872d8
related-to-bug: 6554257
2012-05-24 13:29:47 -07:00
Jeff Tinker
df066c0634 Widevine library update for Jellybean DO NOT MERGE
This release contains widevine library version 4.5.0-7201

Fix NPE in videos app due to missing license status
Resolve SIGPIPE fault in mediaserver

Change-Id: Ib51f4ca5560d3e50363ed4933e07e29e8ab74c7c
related-to-bug: 6512128
related-to-bug: 6528820
2012-05-22 17:36:25 -07:00
Jeff Tinker
cf425f5bbc Fix file descriptor leak in WV library
In ICS we overloaded the curl fd close callout to enable
attributing bandwidth usage to the proper app instead of
the OS.  When you use the curl close callout, you are
expected to explicitly close the file, curl does not do
it for you.  This change adds an explicit fd close on the
curl callout.

Includes widevine library 4.5.0.7147

Change-Id: Ie22e6186f88b55a96e06f63e07f2746349aeae4e
related-to-bug: 6500752
2012-05-17 06:59:58 -07:00
Jeff Tinker
35064be9c6 Revert Widevine 6.0.0 -> 4.5.0 libraries
DO NOT MERGE

Source and library changes to roll back to 4.5.0, including
maintaining the DRM HAL support.

Includes Widevine libraries 4.5.0-7111

Change-Id: I420c6990748e95ad7516ecb2397ebf7707a157f4
related-to-bug: 6492434
2012-05-14 15:06:13 -07:00
Jeff Tinker
c7214ed13e [WVDRM] Fix buffering gets stuck late into movies
Includes Widevine libraries version 6.0.0.7036

Change-Id: I84a6d6853b999571bb7cde812cd44b31436ae972
related-to-bug: 6449713
2012-05-07 18:35:22 -07:00
Jeff Tinker
0b993f0ae4 Widevine library update 6.0.0-7012
This widevine library release includes fixes for the
following defects:

6422432 Unable to watch video due to stream buffering
5543268 DRM: Stuttering in playback of HD movie rental
6444359 [WVDRM] Excessively long startup on movie playback in JellyBean
6448147 [WVDRM] Short and Long Clocks are Identical
5571083 Lot of stuttering when on mobile network

Change-Id: I0ad4e8dbfc73df81e708591158d4c6189048f154
related-to-bug: 6422432
related-to-bug: 5543268
related-to-bug: 6444359
related-to-bug: 6448147
related-to-bug: 5571083
2012-05-04 22:06:03 -07:00
Jeff Tinker
e3c3350281 Fix Widevine error reporting in JellyBean
Includes Widevine library version 6.0.0-6969

Change-Id: I4a606cd730251bfa449f67e8214c3cb411bd3311
related-to-bug: 6429947
2012-05-02 12:22:02 -07:00
Jeff Tinker
92dda7e094 Fix android build for Widevine L3 devices (crespo, trygon)
This patch includes Widevine libraries Version 6.0.0-6859
for L3 devices.

Change-Id: Iddc667393ffe9bd06dc665a8ed3a52f35fb93516
related-to-bug: 6428219
2012-05-01 17:46:22 -07:00
Jeff Tinker
3397e72468 Fix offline license requests and error events
Corrected a regression in error event reporting and a
mismatch in asset paths during rights acquisition.

Also requires https://android-git.corp.google.com/g/#/c/185898/

Contains Widevine libraries version 6.0.0-6957

Change-Id: I4a7603a86feaf437673fc73f0cccb6065dbcce67
related-to-bug: 6414503
2012-05-01 15:46:14 -07:00
Jeff Tinker
ec2d703970 Fix ERROR_IO due to timeout on video stream and corrupt samples
This change applies to the wv extractor when used in conjunction
with new MediaCodec model.

Change-Id: I999990ff41d35641110a58472f1cdb8c4c7db02e
related-to-bug: 5986621
2012-05-01 13:10:42 -07:00
Jeff Tinker
a9f82e979f Add CryptoPluginMode to WV extractor
Allows the WV extractor to run in a mode that is compatible with
the DRM CryptoPlugin HAL API, where decryption is deferred
until the encrypted data is sent through the CryptoPlugin to
the codec.

This patch does:
 (1) Adds a flag mCryptoPluginMode that controls this behavior
     [Note: need framework support to enable/disable this]
 (2) Accumulates information in track metadata to delineate
     crypto unit boundaries for the CryptoPlugin

related-to-bug: 5986621

Change-Id: I3318d5cde38c7b02a7bdb56aca9aece852c9781c
2012-04-26 14:50:28 -07:00
Jean-Baptiste Queru
aaa8479c34 Allow disabling the generic implementation.
Some device like grouper have their own.

Change-Id: I3a2c7e00c1a3158bd4555fefea8c7cee3e426230
2012-04-13 17:11:16 -07:00
Jeff Tinker
300d172ba4 [WVDRM] Reorg of binary libs into proc-specific folders
Rahul's changes in preparation for adding x86 support

Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd
related-to-bug: 6276794
2012-04-10 17:26:58 -07:00
Jeff Tinker
462dc030f8 Upgrade of Widevine libraries from 4.5.0 to 6.0.0
Upload for Dave Parsons

6.0.0 Widevine libraries contain the features required
to support multiple audio tracks and subtitles.  This
is establishing the baseline for those features.

Change-Id: If12074bb2e4364c8107339e2f69453c40698e91f
related-to-bug: 5880566
2012-04-05 15:49:32 -07:00
Jeff Tinker
c8a09dfe42 Protect against rollover of LICENSE_START_TIME when clock is set back
Contains Widevine library version 4.5.0.6480

Change-Id: I735d4a07c38f0eb781f7c5338229b179fdc3a550
related-to-bug: 6202995
2012-03-30 17:12:12 -07:00
Jeff Tinker
835420c31d Fix videos app bandwidth accounting for streaming over 4G
Attribute traffic on socket descriptors to UID of videos app

Multi-repository commit, see also changes in frameworks/base/media.

Includes Widevine library version 4.5.0.6153

Change-Id: I5ddf1b7b758edc82d48a788fc30616d90cab4bd0
related-to-bug: 5434244
2012-03-08 15:08:47 -08:00
Edwin Wong
beb9b7b603 Add support to query through DrmInfoRequest::TYPE_REGISTRATION_INFO to check if a device is provisioned.
Includes Widevine lib version: 4.5.0.5781 AES BR_PYTHON2

Change-Id: Id5e673b97e3ec80532e2d7f42aae687adfecc765
related-to-bug: 5152997
2012-01-27 09:40:36 -08:00
Jeff Tinker
65d4c7ab20 Fix security hole and hang on movie playback
Security hole is in /data/drm world writable directories
Hang on movie playback was found on ASUS TF201

Sorry, can't make these independent since binary libs aren't
mergeable.

Contains Widevine library Version 4.5.0.5753

Change-Id: I01ddfc5b2390f15d5d187dd6581b0a01743f4a68
related-to-bug: 5834297
related-to-bug: 5874137
2012-01-20 10:31:40 -08:00
Jeff Tinker
c00a26a05f Fix OMX codec error playing Widevine content on Nexus S
Includes Widevine library version 4.5.0.5561

Change-Id: I9c69466bd7d055c64a3e8be0804793fe38977161
related-to-bug: 5699816
2011-12-12 10:22:05 -08:00
Edwin Wong
e8951bc684 Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error
Include Widevine library version 4.5.0.5244

5489833 - live stream aborts early
  ignore continuity counter error warning (status=2014)

5414035 Telstra content cannot play, duplicate of 5489515
5489515 cannot play Disney content
  Telstra content has 4 bytes of AudioSpecificConfig instead of 2
  Disney content has 5 byte AudioSpecificConfig whereas 2 bytes appears to be correct for AAC-LC

5207482 SIGSEGV happens on pressing "Show Rights" during playback of expired movies

Change-Id: Iacc0d02d328c228d28b8cc8be93e63fe9f8b4600
related-to-bug: 5207482
related-to-bug: 5414035
related-to-bug: 5489515
related-to-bug: 5489833
2011-11-10 17:36:05 -08:00
Edwin Wong
111050c07d Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers.
Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.

BUG: 5489972
Change-Id: Iad4b2933b47b6614db8e9d75c9d6a5f3f4bc3201
2011-10-28 13:45:14 -07:00
Jeffrey Tinker
82d675f15d [DRM] Terminate HTTPClient thread after content type sniff
Eliminates a measureable power increase after playing YouTube content

Includes Widevine library version 4.5.0.5033

Bug: 5502951
Change-Id: I6ce1582d71d8e7598f1ea0b9d64b22eb6fde3caa
2011-10-25 18:33:47 -07:00
Jeffrey Tinker
073b6b2008 Fix segfault during Widevine playback on switch between .wvm and live
This build includes Widevine release libs version 4.5.0.4972

Bug 5487873

Change-Id: Id1e38de5716fc08758e0369d1f1378860972ed73
2011-10-20 01:05:54 -07:00
Jeffrey Tinker
782380915e Fix playback failure on sample HD 1080p Widevine DRM content
This change includes Widevine library release version 4.5.0.4968

Bug 5455559

Change-Id: I862669ab3a2f7bc33f69b9ea38fa6d1dbb838d35
2011-10-19 20:26:44 -07:00
Edwin Wong
7cc8cb25d2 Fixed always getting -1004 error and "Connection to server lost" on long seek bugs.
Includes Widevine release libs version 4.5.0.4957.

BUG: 5382956,5463212
Change-Id: Ieb28ed4d710f000e881b4a7160d3260d72323587
2011-10-19 12:41:50 -07:00