aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-20release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release- ↵android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
4198291 snap-temp-L50900000084068812 Change-Id: Iad6bd4af24c6a04605da4289b32622d40fa31a62
2017-07-20Merge "An update on ro.hwui.* props"oreo-mr1-devTreeHugger Robot
2017-07-19An update on ro.hwui.* propsJohn Reck
Bug: 63741221 Test: Built docs Change-Id: If6cd68d96f823f2f1401087043627d25e886801c
2017-07-19release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release- ↵android-build-team Robot
4193791 snap-temp-L98700000083613807 Change-Id: I2999f291968a87c7d99d6e85167142069e3f0f42
2017-07-18Merge "Docs: Changes to source.android.com" am: 98c4df9b36 am: 4313c24046 ↵Clay Murphy
am: e483442865 am: 19d638465e Change-Id: Ie892cbb967370666218d7f32de5cb3bfa6d699d4
2017-07-18Merge "Docs: Changes to source.android.com" am: 98c4df9b36 am: 4313c24046Clay Murphy
am: e483442865 Change-Id: I1d85edfbd47befa13ce05aba337b842c78bd1b64
2017-07-18Merge "Docs: Changes to source.android.com" am: 98c4df9b36Clay Murphy
am: 4313c24046 Change-Id: Id6061af73fce23efd9ab690f42f4297087003ec9
2017-07-18Merge "Docs: Changes to source.android.com"Clay Murphy
am: 98c4df9b36 Change-Id: I4dc7c9d3e9567c2f16d603ae353f99e4259110c5
2017-07-18Merge "Docs: Changes to source.android.com"android-o-preview-4Clay Murphy
2017-07-17Docs: Changes to source.android.comAndroid Partner Docs
- 162259976 Add tag for MOB31Z. Note that this is a special release ... by Android Partner Docs <noreply@android.com> - 161887918 Add ART O release config and compile updates to home by claym <claym@google.com> - 161834986 Remove obsolete or useless links by Android Partner Docs <noreply@android.com> - 161834922 Remove more additional obsolete or bad links by Android Partner Docs <noreply@android.com> - 161828510 Update ART configuration by Android Partner Docs <noreply@android.com> - 161687821 Update June and July bulletins to correct CVE typos by daroberts <daroberts@google.com> PiperOrigin-RevId: 162259976 Change-Id: Id39a03ca25e94b9f23ee86e067d8f82aa99158bd
2017-07-12release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release- ↵android-build-team Robot
4173087 snap-temp-L93200000081515229 Change-Id: Ie0fcafb1af7d4726f9cd152cc61a16d847737eb8
2017-07-11resolve merge conflicts of 97621834 to masterClay Murphy
Test: I solemnly swear I tested this conflict resolution. Change-Id: I46e88a190244b311a1145b095ad39d0f536b8794
2017-07-11resolve merge conflicts of bb3e2e85 to oc-dr1-dev-plus-aospClay Murphy
Test: I solemnly swear I tested this conflict resolution. Change-Id: I6b11c9ad616712c4571a425af01c7caa97394815
2017-07-11Merge "Docs: Changes to source.android.com" am: f7613b6660Clay Murphy
am: d213c15435 Change-Id: Id2bf67f0d5e9d62317c5e9592f383f32c0b839e3
2017-07-11Merge "Docs: Changes to source.android.com"Clay Murphy
am: f7613b6660 Change-Id: Ic1b949a7d3a41a11a28579b75c45a1fce65d8882
2017-07-11Merge "Docs: Changes to source.android.com"Clay Murphy
2017-07-11Docs: Changes to source.android.comRuslan Piasetskyi
- 161541119 Updates to 7.1 CDD by gdimino <gdimino@google.com> - 161436702 Update CTS downloads for 7.1 R7, 7.0 R11, 6.0 R20, 5.1 R21 by claym <claym@google.com> - 161410924 Cloned from CL 160326297 by 'g4 patch'. by claym <claym@google.com> - 161246895 Fix typo KM_TAG_USER_SECURE_ID by blamb <blamb@google.com> - 161235192 Clarify guide is for platform, add note for app developers by claym <claym@google.com> - 161217654 Fix typos in "bootloader" references by claym <claym@google.com> - 161131051 SAC FB: Make verified boot flash lock and unlock commands... by daroberts <daroberts@google.com> - 161106942 Remove Jack recommendation by claym <claym@google.com> - 161102887 Correct typo in July 2017 bulletin by daroberts <daroberts@google.com> - 161098528 Update build numbers for Jul security releases by Android Partner Docs <noreply@android.com> - 161094346 Update July 2017 security bulletin with AOSP links by daroberts <daroberts@google.com> - 161017723 Add warnings about incompatibility of FBE and adoptable s... by claym <claym@google.com> - 160996093 Docs: Nav changes to prep for O + new framework image by hvm <hvm@google.com> - 160984727 Devsite localized content from translation request 76cba1... by Android Partner Docs <noreply@android.com> - 160984408 Add instructions to check for device security update by daroberts <daroberts@google.com> - 160971202 July 2017 Security bulletin updates by daroberts <daroberts@google.com> - 160958735 Update audit2allow commands by daroberts <daroberts@google.com> - 160567793 Redirect old Dumpsys pages to DAC by claym <claym@google.com> - 160553240 Devsite localized content from translation request 29dc8d... by Android Partner Docs <noreply@android.com> - 160550105 Use a SHA-256 checksum, not a SHA-1 checksum, for the lat... by Android Partner Docs <noreply@android.com> - 160448356 Add researcher attribution for CVE-2017-0574 by daroberts <daroberts@google.com> - 160342125 Publish localized June security bulletin by daroberts <daroberts@google.com> - 160293585 Devsite localized content from translation request 3cdce1... by Android Partner Docs <noreply@android.com> - 160292361 Adds link to go/sac-guide at top of README for Googlers. by blamb <blamb@google.com> - 160281439 Include a mention of --cbr in the using-repo docs. by Android Partner Docs <noreply@android.com> PiperOrigin-RevId: 161541119 Change-Id: I24270f922ca979327303fd1776d90657095c57a4
2017-07-11Docs: Changes to source.android.comAndroid Partner Docs
- 161017723 Add warnings about incompatibility of FBE and adoptable s... by claym <claym@google.com> - 160996093 Docs: Nav changes to prep for O + new framework image by hvm <hvm@google.com> - 160984727 Devsite localized content from translation request 76cba1... by Android Partner Docs <noreply@android.com> - 160984408 Add instructions to check for device security update by daroberts <daroberts@google.com> - 160971202 July 2017 Security bulletin updates by daroberts <daroberts@google.com> - 160958735 Update audit2allow commands by daroberts <daroberts@google.com> - 160567793 Redirect old Dumpsys pages to DAC by claym <claym@google.com> - 160553240 Devsite localized content from translation request 29dc8d... by Android Partner Docs <noreply@android.com> - 160550105 Use a SHA-256 checksum, not a SHA-1 checksum, for the lat... by Android Partner Docs <noreply@android.com> - 160448356 Add researcher attribution for CVE-2017-0574 by daroberts <daroberts@google.com> - 160342125 Publish localized June security bulletin by daroberts <daroberts@google.com> - 160293585 Devsite localized content from translation request 3cdce1... by Android Partner Docs <noreply@android.com> - 160292361 Adds link to go/sac-guide at top of README for Googlers. by blamb <blamb@google.com> - 160281439 Include a mention of --cbr in the using-repo docs. by Android Partner Docs <noreply@android.com> PiperOrigin-RevId: 161017723 Change-Id: Ie54ae2e7ac3aec03736d94fd13d6dbc16a804b9a Test: make online-sac-docs
2017-07-06release-request-60f1fc0d-1c6d-400a-8b4e-444f1452f036-for-git_oc-mr1-release- ↵android-build-team Robot
4157261 snap-temp-L11100000079944679 Change-Id: Ib2a7307876dbeefb590e768671a48d8b4f3a270f
2017-07-05resolve merge conflicts of 4a5bcd6f to stage-aosp-master am: 3a7443d79d am: ↵Clay Murphy
6890bab6d9 am: e839b247f8 Change-Id: Ic3d133e2d10255f4ffdf486642b15a7ece37aec9
2017-07-05resolve merge conflicts of 4a5bcd6f to stage-aosp-master am: 3a7443d79dClay Murphy
am: 6890bab6d9 Change-Id: I4d6aab2ef841e8f7bf80c05ef8dbbf6a04bd8f2f
2017-07-05resolve merge conflicts of 4a5bcd6f to stage-aosp-masterClay Murphy
am: 3a7443d79d Change-Id: I7b91055881cd04cff6b97402242e08d525f5a551
2017-07-05resolve merge conflicts of 4a5bcd6f to stage-aosp-masterClay Murphy
Test: I solemnly swear I tested this conflict resolution. Change-Id: Id66cb79669462d6f053c0381d6a71eabe43fb454
2017-07-05Merge "Docs: Changes to source.android.com"Clay Murphy
2017-06-26Docs: Changes to source.android.comAndroid Partner Docs
- 159984637 Remove stale information from known issues page by daroberts <daroberts@google.com> - 159713438 Fixed spelling error in terminal command and removed extr... by cqn <cqn@google.com> - 159634352 Fix name of SEEC driver by claym <claym@google.com> - 159628057 Remove unneeded closing tag by cqn <cqn@google.com> - 159627213 Remove unneeded closing tags by cqn <cqn@google.com> - 159627180 Fix minor tag nesting issue by cqn <cqn@google.com> - 159627159 Fixed HTML tag nesting by cqn <cqn@google.com> - 159626603 Add missing closing tags by cqn <cqn@google.com> - 159626543 Remove unneeded tag by cqn <cqn@google.com> - 159626515 Fix tag nesting by cqn <cqn@google.com> - 159626453 Changed tag nesting issues by cqn <cqn@google.com> - 159626442 Add missing tag by cqn <cqn@google.com> - 159625955 Added missing paragraph tags by cqn <cqn@google.com> - 159625722 Fixed header closing tag by cqn <cqn@google.com> - 159625168 Delete unneeded code tag by cqn <cqn@google.com> - 159624516 Add note explaining dollar sign in sample commands by claym <claym@google.com> - 159615772 Delete unneeded </code> tags by cqn <cqn@google.com> - 159615658 Added missing closing tag by cqn <cqn@google.com> - 159612512 Removed a couple unneeded <p> tags by cqn <cqn@google.com> - 159612476 Add missing <p> tag by cqn <cqn@google.com> PiperOrigin-RevId: 159984637 Change-Id: Ib9f6f4905c548fc113dc0724e3e776ad8685a628
2017-06-21release-request-d1418208-3b0b-4ef9-a2f0-a8f8ac6c24e8-for-git_oc-mr1-release- ↵android-build-team Robot
4120176 snap-temp-L55000000076156472 Change-Id: I43c2a7cdc07044ac08e8cd36c8df7a403b8035bc
2017-06-21Merge "Docs: Changes to source.android.com" am: 14605d77b5 am: 833d7d4b81 ↵Android Partner Docs
am: f51ce41011 am: bb57032f17 Change-Id: I7c8bcc0487be283a76b1703188455ef18b255661
2017-06-21Merge "Docs: Changes to source.android.com" am: 14605d77b5 am: 833d7d4b81Android Partner Docs
am: f51ce41011 Change-Id: I78382338377cfd4f1e3e90e568047d8cf93a9d77
2017-06-21Merge "Docs: Changes to source.android.com" am: 14605d77b5Android Partner Docs
am: 833d7d4b81 Change-Id: I0b9150c8dca1a78d35b2aa6382e9aea318397ddb
2017-06-21Merge "Docs: Changes to source.android.com"Android Partner Docs
am: 14605d77b5 Change-Id: I9c5d7f30bfcca332e2522111e53e4fdf24deada3
2017-06-21Merge "Docs: Changes to source.android.com"Treehugger Robot
2017-06-20Docs: Changes to source.android.comAndroid Partner Docs
- 159519221 Add CTS Media 1.3 file link by claym <claym@google.com> - 159296442 Changed devsite tag classes on a couple pages. by cqn <cqn@google.com> - 159296357 Add devsite class to tags in devices/tech/power by cqn <cqn@google.com> - 159296314 Added devsite class to tags in compatibility/cts. by cqn <cqn@google.com> - 159296265 Added devsite class to tags in devices/tech/ota. by cqn <cqn@google.com> - 159273197 Added devsite class to tags for devices/tech/test_infra/t... by cqn <cqn@google.com> - 159269559 Add speed-profile and verify-profile to the list of options by claym <claym@google.com> - 159268556 Add devsite class to tags in devices/tech/display by cqn <cqn@google.com> - 159247742 Add devsite class to tags in devices/tech/admin by cqn <cqn@google.com> - 159246177 Finished adding devsite class to tags on devices/tech/debug by cqn <cqn@google.com> - 159245597 Add devsite tag to classes in devices/tech/debug by cqn <cqn@google.com> - 159128910 Changed breaks to paragraph tags for formatting, and adde... by cqn <cqn@google.com> - 159115811 Add devsite class to tags for devices/tech/config by cqn <cqn@google.com> - 159115392 Added devsite class to tags on devices/tech/connect and d... by cqn <cqn@google.com> - 159114997 Add devsite class to tags in devices/storage and devices/tv by cqn <cqn@google.com> - 158948331 Provide advice to OEM and carrier app developers to reduc... by Android Partner Docs <noreply@android.com> - 158920824 Add devsite class to tags in devices/tech/dalvik by cqn <cqn@google.com> - 158917965 Fix links to sensors.h reference file by claym <claym@google.com> - 158916603 Docs: moving gdb to own page, updating index by hvm <hvm@google.com> - 158915436 Update Security acknowledgement with new researcher info by daroberts <daroberts@google.com> - 158883841 Finish adding devsite class to tags in devices/audio by cqn <cqn@google.com> - 158883680 Add devsite class to tags in devices/sensors and devices/... by cqn <cqn@google.com> - 158871012 Improve Jack deprecation warning message. by gdimino <gdimino@google.com> - 158867373 Add devsite classes to tags for devices/graphics by cqn <cqn@google.com> - 158867298 Added devsite classes to tags in devices/input by cqn <cqn@google.com> - 158867192 Add devsite classes to tags in devices/camera and devices... by cqn <cqn@google.com> PiperOrigin-RevId: 159519221 Change-Id: I924de0c1668bcbcc94ee97e60c144aac4c81708d
2017-06-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-build-team Robot
4111654 snap-temp-L22900000075285650 Change-Id: Ic95460a566df3fc8653329da6356bdd293cbbab4
2017-06-15Merge "Add OWNERS in docs/source.android.com" am: 8560a623b8 am: 568cd27178 ↵Chih-hung Hsieh
am: c62bed4cfe am: c20ae7c739 Change-Id: Ida131d91f78c66b539c362b8305c8bbb4310f41d
2017-06-15Merge "Add OWNERS in docs/source.android.com" am: 8560a623b8 am: 568cd27178Chih-hung Hsieh
am: c62bed4cfe Change-Id: I1c0b6e03cefe1dc0278d5a357fa91c74667aa112
2017-06-15Merge "Add OWNERS in docs/source.android.com" am: 8560a623b8Chih-hung Hsieh
am: 568cd27178 Change-Id: I082ce6882c6b9d8db977465fe86d08fbb8d4ae55
2017-06-15Merge "Add OWNERS in docs/source.android.com"Chih-hung Hsieh
am: 8560a623b8 Change-Id: Ibdafd1c5803aa099ad20651cc001b2f7b0ae9de7
2017-06-15Merge "Add OWNERS in docs/source.android.com"Chih-hung Hsieh
2017-06-14Add OWNERS in docs/source.android.comChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: Ie81e1857b04ab720c3a23633bde0ac22290cb1d6
2017-06-14release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release- ↵android-build-team Robot
4099045 snap-temp-L41300000074003051 Change-Id: If04322efdb7a65330b98642f67d411c9da5821c8
2017-06-13Merge "Docs: Changes to source.android.com" am: 0a9ccdf0b0 am: c391221fea ↵Android Partner Docs
am: 6ccb9c7cc8 am: 669198e6d1 Change-Id: Idf6e6994594f7e8514edbd0c54bd1cc92dd898de
2017-06-13Merge "Docs: Changes to source.android.com" am: 0a9ccdf0b0 am: c391221feaAndroid Partner Docs
am: 6ccb9c7cc8 Change-Id: Iab4f379296dcb3ce09ead8e1b57a4e8654691adc
2017-06-13Merge "Docs: Changes to source.android.com" am: 0a9ccdf0b0Android Partner Docs
am: c391221fea Change-Id: I40a59e562166dc00442d2098fca6cddfad1f8b4c
2017-06-13Merge "Docs: Changes to source.android.com"Android Partner Docs
am: 0a9ccdf0b0 Change-Id: I3cdda0960164eecc17b793d4ce8de892cd41586f
2017-06-13Merge "Docs: Changes to source.android.com"Treehugger Robot
2017-06-13Docs: Changes to source.android.comAndroid Partner Docs
- 158853343 Add devsite-terminal and devsite-click-to-copy to first p... by cqn <cqn@google.com> - 158853184 Add devsite-terminal and devsite-click-to-copy to remaini... by cqn <cqn@google.com> - 158853067 Add devsite-terminal and devsite-click-to-copy to devices... by cqn <cqn@google.com> - 158740747 Add note about HID application collections to usb headset... by daroberts <daroberts@google.com> - 158722461 Add AAudio and links by claym <claym@google.com> - 158561498 CDD: Update Remote Control Req for Android Television dev... by Android Partner Docs <noreply@android.com> - 158429467 Add terminal and click-to-copy to <pre> and <code> tags o... by cqn <cqn@google.com> - 158418156 Remove unnecessary intro header by daroberts <daroberts@google.com> - 158413508 Finish up devsite-terminal and devsite-click-to-copy tags... by cqn <cqn@google.com> - 158316692 Add AOSP links to the June 2017 security bulletin by daroberts <daroberts@google.com> - 158290540 Update unclear command in SELinux validation docs by daroberts <daroberts@google.com> - 158286335 Relax Android TV devices requirement for HEVC 1080P30 sup... by Android Partner Docs <noreply@android.com> - 158286269 Relax Android TV devices requirement for HEVC 1080P30 sup... by Android Partner Docs <noreply@android.com> - 158171876 Add "devsite-terminal" and "devsite-click-to-print" tags ... by cqn <cqn@google.com> - 158167343 Note restricted profiles are also available on TV by claym <claym@google.com> - 158157233 Add tag names for June Security Release. by Android Partner Docs <noreply@android.com> - 158138050 Docs: adding debug updates to home page by hvm <hvm@google.com> - 158083990 Add class="devsite-terminal" tags to <pre> and <code> blo... by cqn <cqn@google.com> - 158069098 Updated image relative path to absolute path. by cqn <cqn@google.com> PiperOrigin-RevId: 158853343 Change-Id: If05d97edad224e03f89e257d4e3ca0124147460b
2017-06-08release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release- ↵android-build-team Robot
4080221 snap-temp-L23400000072087081 Change-Id: I8242481858e789fa213f96f7f26f83aba6d21447
2017-06-06Merge "Docs: Changes to source.android.com" am: 9e286c1def am: 4ecfdb8d77 ↵oreo-dr1-devAndroid Partner Docs
am: a529e1528c am: 5bb2fb1289 Change-Id: Icd46fae1801b46e3290e8e7974140024f2bbe608
2017-06-06Merge "Docs: Changes to source.android.com" am: 9e286c1def am: 4ecfdb8d77Android Partner Docs
am: a529e1528c Change-Id: I8104040835b25fec43bcd90f8bccb47c223c3e42
2017-06-06Merge "Docs: Changes to source.android.com" am: 9e286c1defAndroid Partner Docs
am: 4ecfdb8d77 Change-Id: Id40db24934cc9246236053e4b7a3f1deb979c852