aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-06Merge "Temporarily suppress user-defined-warning in external/sfntly" am: ↵android-wear-p-preview-2android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-wear-8.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1pie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-mr1-devoreo-mr1-1.2-iot-releaseoreo-dr1-devo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6master-cuttlefish-testing-releaseYi Kong
a217f56dac am: f4795d699d am: cee31ff94d am: 313d3399e1 Change-Id: Ibc77173ce49b1b4132603d71aa75e98368e58382
2017-06-06Merge "Temporarily suppress user-defined-warning in external/sfntly" am: ↵android-o-mr1-preview-2android-o-mr1-preview-1Yi Kong
a217f56dac am: f4795d699d am: cee31ff94d Change-Id: I9c8f891aef331a2e8d81df93d799f8356b6bd525
2017-06-06Merge "Temporarily suppress user-defined-warning in external/sfntly" am: ↵Yi Kong
a217f56dac am: f4795d699d Change-Id: I552d253dff767382ad18419796941587dcf3c2e7
2017-06-06Merge "Temporarily suppress user-defined-warning in external/sfntly"Yi Kong
am: a217f56dac Change-Id: I79cae41f9afd0372b9ae39d86fbb0ed865c31796
2017-06-06Merge "Temporarily suppress user-defined-warning in external/sfntly"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Yi Kong
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 am: d4d643f20c am: 5a188a8930 Change-Id: I71606d775478b49d9a24d7588e79fffc693c4e22
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours am: a17637041a am: 54ff5bf084 Change-Id: Ia442c1c2c9888dc6951c293c288ae32bb723b366
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 am: d4d643f20c Change-Id: I2355aacce80eb2de685ef635ba193569e496934f
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours am: a17637041a Change-Id: Ia296a9587c7087329f1c0330928748e8ac9b4d1e
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 am: e87ae78393 am: 2d6ec5dc57 Change-Id: I273523b58063cf5c656d2c543368a1835f54eaf4
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours am: 1a424d47ce am: 2b0af74e57 Change-Id: I696528733597266c7573a7f83ba4bfa518ed2c33
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 am: e87ae78393 Change-Id: I25fe01d39f4d36f88e254f07761828af8b1612df
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1oreo-vts-releaseoreo-devColin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 Change-Id: Ib41b6c22fd5fb44f64beceb9553728de344ea3e7
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours Change-Id: I9fa4c6624ae89dba9e0d63fbcd26576f4ffe8e25
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours am: 1a424d47ce Change-Id: I05de460384bbbdbe3609b8e6e5c2d7b1a0eb1b20
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba am: c75b34eb99 Change-Id: Ifc392b2f59f108296e773451f2bd83a2d5517eb3
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 am: c3008dfeee -s ours Change-Id: Iab8476f3eda1976ddb11633d1644004ab5d80aec
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba am: db883a13ba Change-Id: Ia1a8889fb21971f9340df33d057bc2e03fc2dd06
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c am: 81c126c6c5 Change-Id: I47d7f6021472b084b247264fd850a54c2be67a67
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 am: 3bb233dbba Change-Id: I8be573ef10c65f90d33ae668ec51feba98aa81d7
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c Change-Id: I7f0e491ec3867fbc1500e7cce867e89dd082af83
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975 Change-Id: I141c890cfecbd075f08e91b337829259a95d6a1a
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc Change-Id: I14cc8191178eb15dd2c151397773222b499ab1b1
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e Change-Id: I891410308b10213c54eb3ef37101339fc45daeb1
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f Change-Id: Ibb3a45fb71fdc516b8b16f5a1904694a8a3fa159
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 Change-Id: I4f816b5c9d30a52e6aad5d03c00d3c67a75cbb17
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 Change-Id: I39a0b3466891876e4bde15288d393410da157c88
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d Change-Id: I9bbd63fe2eaa1c6bcd0b6f01962a730eb62672d4
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e Change-Id: Ibc4d46cbbb3166899422486da9fc39f99eaf3db6
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 Change-Id: Iff9062b9589d8d33021e630d46a945f6bad3aa77
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 Change-Id: I23c663162dfc013034d0add499b40581c73544ba
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb Change-Id: I12e6a3e5350ca9c82637c060d3c1263f0714b2ba
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a Change-Id: I5d5c3b8fa416a95cd92a16b186b7af378e0c1eac
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 Change-Id: I2f81445bbc734aa97ef5480507d36fe1b8473a7b
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 Change-Id: Ie745f9c486932b2746e82f7a26d5023a61d518e6
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a Change-Id: I60d266a786cff413878d8fde28da1b7b7922e676
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: ↵Colin Cross
90e121df27 am: 9e1ecbca64 am: ccb3219886 Change-Id: I115cba17fa9a3641a761a0175fe6452d9d4883f4
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 Change-Id: Ib2862c4330034e2bfa4a65e6d3f4dfd61e0e4f44
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: 90e121df27Colin Cross
am: 9e1ecbca64 Change-Id: Idf5cefa6b540d28eb66a720cc60cec17319f2e3d
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
d7c3ad1d95 am: fd76129cde am: 3d3aab44bf Change-Id: Ib70f9f05aa51a6927735d58dff3b7b339e6ae03a
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275aColin Cross
am: 90e121df27 Change-Id: Ia7528e93222c0068009b5e6109e66bc4733cba8c
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into master am: d7c3ad1d95Colin Cross
am: fd76129cde Change-Id: Ibe3ac0fb59f7497c51a4d41bf24c5d9290c46f9e
2017-06-06Merge commit 'bbc9221' into master am: d4aea7c865Colin Cross
am: d66cd7275a Change-Id: I8a738d1a806875e344d0bc10e1015ea446ae7fe0
2017-06-06Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: d7c3ad1d95 Change-Id: If3ddd61b462fa1954c1e77fe2a8a6e0f725baf56
2017-06-06Merge commit 'bbc9221' into masterColin Cross
am: d4aea7c865 Change-Id: Iffa9dcccea8ee4643a5c881131556d831729dcbc
2017-05-03Temporarily suppress user-defined-warning in external/sfntlyYi Kong
Test: Build Bug: 37911198 Change-Id: Iba4d4051293e21452da051d4be2e8b33b3c1df24
2017-04-07Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
Bug: 32096780 Test: mmma -j external/skia Change-Id: Ia60d7b9984c1007e82bfea10c1a6df32418100d5 (cherry picked from commit bd503d67f403ca1e1d33226626c494d5513701e4)
2017-04-07Merge commit 'bbc9221' into masterColin Cross
This merges the history from upstream without making any changes to the code. Bug: 33280507 Change-Id: I303a906c2cb361cdc2b9a6c99da2b09782467254 (cherry picked from commit 5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed)
2017-03-24Merge "Add missing #include <unicode/unistr.h> statement." am: 80d845b8fa ↵android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r4android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1oreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releaseJoachim Sauer
am: 9636835bc0 am: 247d6d1a34 Change-Id: I95d8b3b0725adf55aab2e7882b8032f6fe441071
2017-03-24Merge "Add missing #include <unicode/unistr.h> statement." am: 80d845b8faJoachim Sauer
am: 9636835bc0 Change-Id: Iec37ecd170cc8886266b450a358b054d567e32cf