OSDN Git Service
Ruben Brunk [Fri, 30 Nov 2012 17:11:16 +0000 (09:11 -0800)]
Merge "Refactoring crop, made unconstrained." into gb-ub-photos-bryce
Ruben Brunk [Wed, 31 Oct 2012 18:44:15 +0000 (11:44 -0700)]
Refactoring crop, made unconstrained.
Bug
7401363
Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
Baligh Uddin [Thu, 29 Nov 2012 15:03:02 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d0394e913b49becdaf6351a82e65968fe244ee1
Auto-generated-cl: translation import
nicolasroard [Thu, 29 Nov 2012 08:33:49 +0000 (00:33 -0800)]
am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
nicolasroard [Thu, 29 Nov 2012 08:01:59 +0000 (00:01 -0800)]
(re-)add vertical/horizontal lines when moving Curves
Align histogram with Curves grid.
bug:
7361722
Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
Nicolas Roard [Thu, 29 Nov 2012 08:06:34 +0000 (00:06 -0800)]
am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
Nicolas Roard [Thu, 29 Nov 2012 08:04:49 +0000 (00:04 -0800)]
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 05:52:46 +0000 (21:52 -0800)]
Added dashed diagonal for crop.
Bug:
7634466
Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
nicolasroard [Thu, 29 Nov 2012 06:29:13 +0000 (22:29 -0800)]
am
39d46790: Fix transparency issue under the spinner.
* commit '
39d4679070caf308f04542e414fc2e3c34f9cefa':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 06:24:24 +0000 (22:24 -0800)]
Fix transparency issue under the spinner.
bug:
7634701
Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
nicolasroard [Thu, 29 Nov 2012 06:19:01 +0000 (22:19 -0800)]
am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:14:20 +0000 (22:14 -0800)]
Fix potential crash
(regression introduced with fix for
7406402)
bug:
7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
nicolasroard [Thu, 29 Nov 2012 06:00:50 +0000 (22:00 -0800)]
am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 05:50:46 +0000 (21:50 -0800)]
Set crop ratio to unconstrained by default.
bug:
7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
nicolasroard [Thu, 29 Nov 2012 05:27:27 +0000 (21:27 -0800)]
am
205d0cdf: Fix overdraw the correct way...
* commit '
205d0cdf0590bc1156a1d7fff1d0811d142de4a6':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:20:37 +0000 (21:20 -0800)]
Fix overdraw the correct way...
bug:
7634701
Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
nicolasroard [Thu, 29 Nov 2012 05:02:15 +0000 (21:02 -0800)]
am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:00:30 +0000 (21:00 -0800)]
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 05:00:00 +0000 (21:00 -0800)]
am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
68e4ae64380e2c9843faaec63b98ba51479c0f11':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 04:58:35 +0000 (20:58 -0800)]
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:57:50 +0000 (20:57 -0800)]
am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)]
Merge "Add new borders assets" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 03:31:59 +0000 (19:31 -0800)]
Add new borders assets
bug:
7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
nicolasroard [Thu, 29 Nov 2012 04:54:39 +0000 (20:54 -0800)]
am
cd84d676: Fix history panel overlap
* commit '
cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)]
Fix history panel overlap
bug:
7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
nicolasroard [Thu, 29 Nov 2012 03:11:42 +0000 (19:11 -0800)]
Fix overdraw in FilterShow activity
bug:
7634701
Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
nicolasroard [Thu, 29 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Fix flashing in geometry panel
bug:
7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
nicolasroard [Thu, 29 Nov 2012 01:23:04 +0000 (17:23 -0800)]
am
987bc8aa: Fix wrong colors in Curves
* commit '
987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:19:55 +0000 (17:19 -0800)]
am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:09:59 +0000 (17:09 -0800)]
Fix wrong colors in Curves
bug:
7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
nicolasroard [Thu, 29 Nov 2012 01:17:35 +0000 (17:17 -0800)]
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:05:44 +0000 (17:05 -0800)]
am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:04:48 +0000 (17:04 -0800)]
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
John Hoford [Thu, 29 Nov 2012 00:57:34 +0000 (16:57 -0800)]
am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:56:20 +0000 (16:56 -0800)]
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 00:35:47 +0000 (16:35 -0800)]
Fix moving points in the Curves editor
bug:
7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
nicolasroard [Wed, 28 Nov 2012 23:57:17 +0000 (15:57 -0800)]
am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:56:07 +0000 (15:56 -0800)]
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
Ruben Brunk [Fri, 16 Nov 2012 21:51:08 +0000 (13:51 -0800)]
Added locking to ImageLoader.
Bug:
7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
Ruben Brunk [Wed, 28 Nov 2012 23:46:05 +0000 (15:46 -0800)]
am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
Bobby Georgescu [Wed, 28 Nov 2012 18:44:20 +0000 (10:44 -0800)]
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
Ruben Brunk [Wed, 28 Nov 2012 00:13:32 +0000 (16:13 -0800)]
Minor fix for some FP rounding errors in crop.
Bug
7566505
Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
Your Name [Wed, 28 Nov 2012 00:07:55 +0000 (16:07 -0800)]
resolved conflicts for merge of
3c6a0610 to gb-ub-photos-bryce
Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
Your Name [Tue, 27 Nov 2012 00:33:49 +0000 (16:33 -0800)]
Remove orientation compensation
Bug:
7446056
Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
Bobby Georgescu [Tue, 27 Nov 2012 19:21:51 +0000 (11:21 -0800)]
AlbumDataLoader.get returns correct value if not in cache
Bug:
7621656
Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
Baligh Uddin [Tue, 27 Nov 2012 19:36:56 +0000 (11:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ice4c79596741c2594b91c34d0c2e2f3680e9cb93
Auto-generated-cl: translation import
Angus Kong [Tue, 27 Nov 2012 01:37:51 +0000 (17:37 -0800)]
Merge "Backup the preferences to the backup service." into gb-ub-photos-bryce
Teng-Hui Zhu [Mon, 19 Nov 2012 17:48:09 +0000 (09:48 -0800)]
Merge "Video: Fix crash in trimming/muting video in GB." into gb-ub-photos-bryce
Baligh Uddin [Fri, 16 Nov 2012 23:06:30 +0000 (15:06 -0800)]
am
c6e93291: (-s ours) Import translations. DO NOT MERGE
* commit '
c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:05:33 +0000 (15:05 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 16 Nov 2012 20:23:30 +0000 (12:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0519c4f0ed568661df63ae93ab586b7c639860b5
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:22:59 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie207a187da4dcd2212b987ec47e1faf24542ae08
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:21:43 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id9ca88eb57a0765e6e16c051de418b33f5d02fce
Auto-generated-cl: translation import
Teng-Hui Zhu [Tue, 13 Nov 2012 18:39:38 +0000 (10:39 -0800)]
Video: Fix crash in trimming/muting video in GB.
Basically switched to use sherlock actionbar and protect various new methods
with API level check.
bug:
7546257
Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
Teng-Hui Zhu [Fri, 16 Nov 2012 17:53:16 +0000 (09:53 -0800)]
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
Angus Kong [Fri, 16 Nov 2012 02:19:30 +0000 (18:19 -0800)]
am
18b38883: Guard tiles by synchronized block.
* commit '
18b388839ed9858a3b35cec9a636e5cde58a528a':
Guard tiles by synchronized block.
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am
139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
139efdbcd66d718b0d24d42e2ea18432469ac005':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am
b0aae659: (-s ours) Import translations. DO NOT MERGE
* commit '
b0aae659bdc27af5dbe460541f3e9843fc815b1f':
Import translations. DO NOT MERGE
Teng-Hui Zhu [Tue, 13 Nov 2012 18:39:26 +0000 (10:39 -0800)]
Video: Add the mute functionality.
1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.
bug:
7543943
Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
Earl Ou [Wed, 14 Nov 2012 09:19:39 +0000 (17:19 +0800)]
Remove import exiftags
Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
Angus Kong [Wed, 14 Nov 2012 09:11:10 +0000 (17:11 +0800)]
Guard tiles by synchronized block.
Tiles might be touched in different threads.
bug:
7490351
Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
Earl Ou [Wed, 14 Nov 2012 08:23:35 +0000 (16:23 +0800)]
use ExifReader in MediaDetails
Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
Earl Ou [Wed, 14 Nov 2012 05:46:40 +0000 (13:46 +0800)]
use ExifParser in ImageLoader
Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6
Earl Ou [Wed, 14 Nov 2012 07:30:51 +0000 (15:30 +0800)]
Use getValueAt() to read different data in ExifTag
Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
Hung-ying Tyan [Tue, 13 Nov 2012 06:16:14 +0000 (22:16 -0800)]
Merge "use NO_VALUE when the output of exiftool is invalid" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:53 +0000 (22:15 -0800)]
Merge "Do not use parentheses for Model tag in exiftool parser" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:28 +0000 (22:15 -0800)]
Merge "Parse the layer of exiftool output" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:04 +0000 (22:15 -0800)]
Merge "Exiftool parser" into gb-ub-photos-bryce
Doris Liu [Mon, 12 Nov 2012 23:17:36 +0000 (15:17 -0800)]
Fix UnsupportedOperationException in MediaObject
Bug:
6495745
Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
Baligh Uddin [Fri, 9 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 9 Nov 2012 22:19:12 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 9 Nov 2012 14:52:00 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib83d4034adb61835865c308210daeb7767128583
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:51:36 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:48:48 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I02bfb14ad6bc12c5628b9152e0720f6a65588da8
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:48:20 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import
John Hoford [Thu, 8 Nov 2012 18:41:24 +0000 (10:41 -0800)]
reduce size of tiny planet if malloc fails
bug:
7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
Angus Kong [Thu, 1 Nov 2012 03:49:43 +0000 (11:49 +0800)]
Backup the preferences to the backup service.
bug:
7259104
Change-Id: Id99f8782f0fb5b93b89930d51d38e7d1d98af11d
Earl Ou [Wed, 7 Nov 2012 09:56:11 +0000 (17:56 +0800)]
Convenient function to add timestamp related exif tags
Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9
Earl Ou [Wed, 7 Nov 2012 07:28:48 +0000 (15:28 +0800)]
use ExifParser to parse the orientaion
Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
Earl Ou [Wed, 24 Oct 2012 05:09:39 +0000 (13:09 +0800)]
Handle wrong thumbnail tag type
Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9
Earl Ou [Wed, 24 Oct 2012 02:44:03 +0000 (10:44 +0800)]
Handle undefined tags and ignore copyright tag in exif test
Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
Earl Ou [Fri, 19 Oct 2012 15:27:44 +0000 (23:27 +0800)]
Handle invalid offset value in ExifParser
Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1
Earl Ou [Fri, 19 Oct 2012 12:23:28 +0000 (20:23 +0800)]
ignore image with invalid thumbnail type in Exif test
Change-Id: I6fc3a2dde4caf881b3b63aa95f1997ee9ccd4dbc
Earl Ou [Fri, 19 Oct 2012 12:08:13 +0000 (20:08 +0800)]
Handle tag not found in ExifParserTest
Change-Id: I892336ff3f73f91f5ac45ab9868f4ecfa61051ac
Earl Ou [Wed, 24 Oct 2012 01:46:29 +0000 (09:46 +0800)]
fix OOM in exif test
Change-Id: I41831e5831b2081f9b6bef6e57bd914faa41385b
Baligh Uddin [Wed, 7 Nov 2012 00:06:28 +0000 (16:06 -0800)]
am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
85d20a07d6412f453e7956c105ff8f8548094186':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:06:26 +0000 (16:06 -0800)]
am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Tue, 6 Nov 2012 22:37:44 +0000 (14:37 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Tue, 6 Nov 2012 19:57:33 +0000 (11:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2150a9c0fa87324b32fbf8139caea8d13ab57a70
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 19:56:55 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5
Auto-generated-cl: translation import
Bobby Georgescu [Tue, 6 Nov 2012 05:21:55 +0000 (21:21 -0800)]
Fix scenario where launching Gallery launches Camera
Bug:
7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
Bobby Georgescu [Mon, 5 Nov 2012 22:12:51 +0000 (14:12 -0800)]
Split PhotoPage into FilmstripPage and SinglePhotoPage
Bug:
7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
Bobby Georgescu [Mon, 5 Nov 2012 21:31:42 +0000 (13:31 -0800)]
Load correct localized album names after language change
Bug:
7459805
Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
Doris Liu [Mon, 5 Nov 2012 21:09:52 +0000 (13:09 -0800)]
Adding AccessibilityUtils class
Bug:
7434841
All the functions in this class should be backward compatible to
gingerbread.
Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
Doris Liu [Sat, 3 Nov 2012 01:22:07 +0000 (18:22 -0700)]
Add API check for method announceForAccessibility
Bug:
7434841
Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4
Bart Sears [Fri, 2 Nov 2012 23:27:30 +0000 (16:27 -0700)]
am
b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
b41864f13b83a4f2d92f601b2e4381762ad1effa':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
Angus Kong [Fri, 2 Nov 2012 17:38:26 +0000 (10:38 -0700)]
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
Baligh Uddin [Fri, 2 Nov 2012 14:22:18 +0000 (07:22 -0700)]
am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
3252800c7fe6bdb69b066eae0db739d06cfec64d':
Import translations. DO NOT MERGE
Angus Kong [Fri, 2 Nov 2012 08:53:22 +0000 (16:53 +0800)]
Don't use activatedBackgroundIndicator under API 14
bug:
7460473
Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8