aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 2490056442 -s ours am skip reason: subject contains skip directive Change-Id: Iaef4efa2b406df639734491c3cf2a3de4877fe61
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I8bf6f948a13e3d3540bcb6db87e225c63104a53e
2019-01-11Merge "Add default code reviewers into OWNERS" am: 09d9bf1ee3 am: 7dd738f97dChih-hung Hsieh
am: 5e56cb9c8a Change-Id: Ia7ef31de1d21295c8aae66f4078e7229f8328545
2019-01-11Merge "Add default code reviewers into OWNERS" am: 09d9bf1ee3Chih-hung Hsieh
am: 7dd738f97d Change-Id: I875970262c316c0be731ca820b2b9d98ac3e424d
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 09d9bf1ee3 Change-Id: I18d84c0bf49d01b1ee3fff45e742dbcbe6970013
2019-01-11Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I1d2f9134e4e9a0063e4104282200ec42f5369a4c
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 99a5e3baf7 -s ours am: ↵Xin Li
6eebedf432 -s ours am: 4f272616f2 -s ours Change-Id: Iacb415866074c9e8c3ee97330917681a8b04e8b8
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 99a5e3baf7 -s oursXin Li
am: 6eebedf432 -s ours Change-Id: Iea635b639a6eadc2064d2b0ea72226f93246df4b
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 99a5e3baf7 -s ours Change-Id: Ic31aa2480c040d594d50c7cff40b45a613dce053
2018-12-10Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I56f2a9f345b3fce27e3841bbdd11fa00a32c5a36
2018-02-07Snap for 4590521 from 6668c743790380cb3e7889c2abb6cd53b720a211 to pi-releaseandroid-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-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-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-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_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Icfe42e06faa0056a7b7c33e81ad976667515fab5
2018-02-07Merge "Build hamcrest with core_current" am: 8ac829b3c6 am: 3f279fec9candroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-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_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-releaseJiyong Park
am: 16600a01e4 Change-Id: Id699a60afe02f05eb6732de7529d18517c2e86f8
2018-02-06Merge "Build hamcrest with core_current" am: 8ac829b3c6Jiyong Park
am: 3f279fec9c Change-Id: If855e700d9c96455ccc7f3ae749e5c0f7ee7298e
2018-02-06Merge "Build hamcrest with core_current"Jiyong Park
am: 8ac829b3c6 Change-Id: I1a4a2ee8cd46d75a08855390c37aef3a75bf3bef
2018-02-06Merge "Build hamcrest with core_current"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-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-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-31Build hamcrest with core_currentJiyong Park
Using core_current ensures that the module is not using any Android APIs (e.g. APIs under android.* packages), but only core Java APIs. Bug: 72206056 Test: m -j hamcrest Change-Id: I189cb1efa1fc1a171f15c1a14255a85cc30c934b
2017-10-13Snap for 4393550 from 086d9d51dc7c71ce8713f95e27efe53cb3363a8e to pi-releaseandroid-build-team Robot
Change-Id: I03c991e18be66372feee09708d5d22490b99e785
2017-10-11resolve merge conflicts of bc46af5 to masterColin Cross
Test: I solemnly swear I tested this conflict resolution. Change-Id: I3c06603304ca15fd0c5d5bc0d359603c74b12c85
2017-10-11Merge changes from topic "junit-soong" am: 9f35e340ac am: a87b7d3237android-wear-8.0.0_r1Colin Cross
am: 86c71ca379 Change-Id: Ic60a751a94c52f160eece5bc3542f2ff4449f4d0
2017-10-11Merge changes from topic "junit-soong" am: 9f35e340acColin Cross
am: a87b7d3237 Change-Id: If18c13b6b42f86e661992a55d88f7c2074456efc
2017-10-11Merge changes from topic "junit-soong"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
am: 9f35e340ac Change-Id: Iec2f6244d9e2d3c91d7ae7e3e0682544bbb64b1f
2017-10-11Merge changes from topic "junit-soong"Colin Cross
* changes: Convert external/hamcrest to Android.bp Add host build for hamcrest-library.
2017-10-11Convert external/hamcrest to Android.bpColin Cross
See build/soong/README.md for more information. Test: m -j checkbuild Change-Id: I0225256fa040272b0c73afc09adac9c33ef28b06
2017-10-09Add host build for hamcrest-library.Yusuf Mohsinally
This library contains useful functions in tests. Add a build target for host side, so that they can be used in host side tests. Test: m hamcrest-library-host -j12 Bug: None Change-Id: I93d82f44b2e4bb0bf5ab5057d03fe063f637fea3 Merged-In: I93d82f44b2e4bb0bf5ab5057d03fe063f637fea3 (cherry picked from commit 3408e0e6c43de58ba35b06e6c4b612dc86d342c9)
2017-07-28Add host build for hamcrest-library.Yusuf Mohsinally
This library contains useful functions in tests. Add a build target for host side, so that they can be used in host side tests. Test: m hamcrest-library-host -j12 Bug: None Change-Id: I93d82f44b2e4bb0bf5ab5057d03fe063f637fea3
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2 am: 0d446c0a6fandroid-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-vts-8.0_r2android-vts-8.0_r1android-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-o-mr1-preview-2android-o-mr1-preview-1android-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_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-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-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devPaul Duffin
am: c2e228b07b Change-Id: I737b987a8b22811c7ea058bcd9898b58694b58ce
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2Paul Duffin
am: 0d446c0a6f Change-Id: I91bce7a26df4532d6926910885171249e6336a5f
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Paul Duffin
am: f324aac9e2 Change-Id: I12d85f17def51bf7047dd664b941ea1cdb2bfc92
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'android-o-preview-1android-n-mr2-preview-2o-previewPaul Duffin
* changes: Temporarily add void is(Class) to cause compile time errors Make it compile in error prone Replace org.hamcrest.Factory for backwards compatibility Remove org.hamcrest.beans and update Matchers Upgrade to almost 2.0.0.0
2017-02-22Temporarily add void is(Class) to cause compile time errorsPaul Duffin
The is(Class) method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the is(Object) method instead. Although not every existing usage would compile successfully it is possible that some could and that would result in a change in the runtime behavior that could be difficult to detect and fix. This change aims to turn any significant usage of this method into a compile time error. Bug: 30946317 Test: make checkbuild Change-Id: I48d1c80fb9faae4e4c490f30c9fe0275fd66a58b
2017-02-22Make it compile in error pronePaul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: If762c67adc8ffd0db9d7ea4dd0e41c5fdb0197f2
2017-02-09Replace org.hamcrest.Factory for backwards compatibilityPaul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: I47a2c30f820a35ceabdcdb3f972b36fd843f7d76
2017-02-09Remove org.hamcrest.beans and update MatchersPaul Duffin
This package relies on java.beans. which is not supported on Android. Bug: 30946317 Test: make checkbuild Change-Id: I87564d796292207de796c34760ec7e33e2aca3c3
2017-02-09Upgrade to almost 2.0.0.0Paul Duffin
See the README.android for the exact version used and an explanation as to why it was chosen. Bug: 30946317 Test: make checkbuild Change-Id: Icae106f5e4a62d2a34f4cf03506fd63676814c07
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 am: e6442f2604 am: a7b13a9be8 Change-Id: I4e29972dddb17dd667623ba1d9383c80f8b90fc8
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 am: e6442f2604 Change-Id: Ice7c16b51eda7dfd8dfed60f1476cdf13286668c
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors" am: ↵Paul Duffin
21a7b5b68f am: f019c17e68 Change-Id: Id38f78144dc2ae1d0192942de2ae2ff4b6869ae8
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors"Paul Duffin
am: 21a7b5b68f Change-Id: Iacfe2b469fac261f8fea4af5e687cce554e64826
2017-02-08Merge "Temporarily add void is(Class) to cause compile time errors"Paul Duffin
2017-02-06Temporarily add void is(Class) to cause compile time errorsPaul Duffin
The is(Class) method was removed upstream between Hamcrest 1.1 and 1.3 in favour of the instanceOf(Class) method. Unfortunately, existing usages of it could still compile against the is(Object) method instead. Although not every existing usage would compile successfully it is possible that some could and that would result in a change in the runtime behavior that could be difficult to detect and fix. This change aims to turn any significant usage of this method into a compile time error. Bug: 30946317 Test: make checkbuild Change-Id: Ib0fac6e944b94ba8f1b5434d64549cc12f20d938
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3 am: ↵Paul Duffin
11a97a2ff7 am: 1dfb5bbe24 Change-Id: Ib4f853674ae97e7d7b4e3cef05e2668ef514e045
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3Paul Duffin
am: 11a97a2ff7 Change-Id: Ic6f19947a26f73d271baade0e05a356d191b8b09
2017-01-24Merge "Match upstream file structure" am: 5d9cc8c989Paul Duffin
am: b5937e4be3 Change-Id: If80fc516cf4d452c8f847a578687b32f0cf87a2e
2017-01-24Merge "Match upstream file structure"Paul Duffin
am: 5d9cc8c989 Change-Id: I3b544565dfe8750cda1b1b10c2231dda02f54470
2017-01-24Merge "Match upstream file structure"Treehugger Robot
2017-01-20Match upstream file structurePaul Duffin
Bug: 30946317 Test: make checkbuild and run cts CtsTextTestCases Change-Id: I6c1773018f95855eb6599d66f6fb5923c7d48b03
2016-12-15Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6f am: 43a62f7d24Paul Duffin
am: 5f28c864e2 Change-Id: Ief544f8a11b0909718a6835ca7fe16328cf42ded
2016-12-15Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6fPaul Duffin
am: 43a62f7d24 Change-Id: Ic5fb12f67a5dd7eba52b853d3516fbf41b5e54af