summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 5eae8ebb3c5756e41e77a1f7201fcf94b0eade1f to ↵aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030android14-mainline-extservices-releaseAndroid Build Coastguard Worker
mainline-extservices-release Change-Id: I5d5311be8f7b3c4ade77c7d99e8d4edd5836fb24
2022-08-18Merge "Disable errorprone on replicaisland" am: bf3e24b72e am: 21bcab8a89 ↵HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseCole Faust
am: b9fab5634d am: 2077008940 am: d36836202a Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2188288 Change-Id: I0c627b6d18c371a48e8a8d427f85c2b4084a63e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18Merge "Disable errorprone on replicaisland" am: bf3e24b72e am: 21bcab8a89 ↵android-u-beta-1-gplmain-16k-with-phonesCole Faust
am: b9fab5634d am: 2077008940 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2188288 Change-Id: Ibe2a281bc1fb84b1ed6f4182d12d21a9ed6879df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18Merge "Disable errorprone on replicaisland" am: bf3e24b72e am: 21bcab8a89 ↵Cole Faust
am: b9fab5634d Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2188288 Change-Id: I0513c3ead9556f776e8d5aa2fdc9092ebb94a22d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18Merge "Disable errorprone on replicaisland" am: bf3e24b72e am: 21bcab8a89Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2188288 Change-Id: Iaec5aa3a79fd61e6240b64504c24b5dea6f304ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18Merge "Disable errorprone on replicaisland" am: bf3e24b72eCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2188288 Change-Id: Ib9b28bb586edef792179139eeb687dcd059b2aca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18Merge "Disable errorprone on replicaisland"main-16kCole Faust
2022-08-17Disable errorprone on replicaislandCole Faust
This is an old, no longer maintained app. In order to not have to fix errorprone errors in it, disable errorprone. Bug: 242630963 Test: RUN_ERROR_PRONE=true m javac-check Change-Id: Iafe6889a6327b624533ea1287b8011344ea405d8
2022-05-10Snap for 8564071 from 9eaf7c7d4eae3475ee4327cc2bb7fd4ec554e68d to ↵aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020android13-mainline-extservices-releaseAndroid Build Coastguard Worker
mainline-extservices-release Change-Id: I882a8aeecf6b25af5a0bdcc264a7acb3cc429723
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 am: 77e5e4d3c7 am: 9fdb16394d am: ff7c83db1d Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: I251132604156a391732f7be5c52f6dbce1db3792 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseTreehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 am: 77e5e4d3c7 am: 9fdb16394d Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: Ib04dee889c2b7133c0b14d3448c8d27ce122338c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 am: 77e5e4d3c7 am: 9eaf7c7d4e Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: I2ec4a4a2add25084862781421962346675af8c07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 am: 77e5e4d3c7 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: Id2c3a7f1e23ff652daf825aa5ddd9fadd421489c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Treehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 am: 77e5e4d3c7 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: Ib0b1e84cd0568e21df6b9e1b9d3947a28c92673d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devTreehugger Robot
26b1c8cacb am: e7915c1c31 am: acd61f8e21 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: I148cbe487cf75db636a1e5ab4683f514bb099917 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
26b1c8cacb am: e7915c1c31 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: I7002fb947251275fc6e9d878738b601f8302848d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: 26b1c8cacbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/2060072 Change-Id: I542f2736b5e48fd663877e3f05509dd150129882 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS"Treehugger Robot
2022-04-12Jeff moved to a different team so remove him from OWNERSXin Li
Change-Id: I37ce148bb5ad5faae4a151c9134fd60a1f47b084
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: ↵Xin Li
629639a090 -s ours am: ff394c916f -s ours am: d40f0af373 -s ours am: 8b03ece57e -s ours am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653 Change-Id: I89d9b86c3b44afd9c64ab388a76d9b0ac9f5a123
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: ↵Xin Li
629639a090 -s ours am: ff394c916f -s ours am: d40f0af373 -s ours am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653 Change-Id: I8076cd78fda61ddd7e58718f2b54ca71f0e00470
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
629639a090 -s ours am: ff394c916f -s ours am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653 Change-Id: Ia6f29be39482e853e00092b79fb9d9926b536fc4
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: ↵Xin Li
629639a090 -s ours am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653 Change-Id: I6f4ab73b0f32f8c906bdb3afb5a0bfd9cc92874f
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s oursXin Li
am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653 Change-Id: I7439f63bd8e5ca092325d841ff513f4b96bac813
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a Change-Id: Idbf9fd6a172a4dc5dab7c19ab88699640417f774
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
95d9d77e3f -s ours am: debebe4065 -s ours am: b0bc918e24 -s ours am: 30e28248bc -s ours am skip reason: Merged-In I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 with SHA-1 4ec4185b02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/replicaisland/+/15571746 Change-Id: Iebfeb18248600298ca4d8f29bbf51dd63c640021
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
95d9d77e3f -s ours am: debebe4065 -s ours am: b0bc918e24 -s ours am skip reason: Merged-In I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 with SHA-1 4ec4185b02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/replicaisland/+/15571746 Change-Id: If7fad35981fa2a3b8986e3ade0e3ab480399ba56
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
95d9d77e3f -s ours am: debebe4065 -s ours am skip reason: Merged-In I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 with SHA-1 4ec4185b02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/replicaisland/+/15571746 Change-Id: I357ebd2f4548149dbc37cd36eaf8748c56e798bc
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
95d9d77e3f -s ours am skip reason: Merged-In I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 with SHA-1 4ec4185b02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/replicaisland/+/15571746 Change-Id: I922fbb96f92a6d2ab451dacb5edf340ea2fb4e3a
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 Change-Id: Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a
2021-06-21Snap for 7478067 from 6109b65cf9d72e77a0fde1027a973d382296d52c to ↵android-mainline-12.0.0_r9android-mainline-12.0.0_r87android-mainline-12.0.0_r72android-mainline-12.0.0_r44android-mainline-12.0.0_r27android-mainline-12.0.0_r117android-mainline-12.0.0_r102android12-mainline-extservices-releaseandroid-build-team Robot
mainline-extservices-release Change-Id: I3ef7b800966adebb62f693e4fd93863c1070d61e
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I655cad8e1f31616b6198bf3bdc1f2df2d290b365
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
70d4419332 am: d1848dfb34 am: 2290893fab am: 4ec4185b02 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba620700dc62757743ef65a777521963ccc0b010
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵Treehugger Robot
70d4419332 am: d1848dfb34 am: 2290893fab am: 4ec4185b02 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06dba5392f58d253e7b1f30b5081cce3ead62e31
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseTreehugger Robot
70d4419332 am: d1848dfb34 am: 2290893fab Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵Treehugger Robot
70d4419332 am: d1848dfb34 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib168964e9f9523bf194d54bad72eee27b73b9869
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: 70d4419332android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10e15a515775de2c4ca96177bdce7f463cb7f048
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/replicaislandBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic516de87f307c3d66d27a2d2f7615bf5058be914
2020-11-04Fix manifest for SPaul Thomson
This app is used in the following CTS tests: android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingSlow Bug: b/172076843 Change-Id: Ib5e5f55f7e00491b10599374648445646a0050ee
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 am: 63f1be6028 am: 2884d38c8e Change-Id: I7fbf4435c631dad38ee5f5690fb9b56d81c1181f
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 am: 63f1be6028 Change-Id: I0b1465670c0e91bd4ae407bfc3fdcf3e3e146309
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 Change-Id: Ic0474b389b6ee8d16e9a9029a451fb171ce423d2
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 Change-Id: I12c05c9062fff9926a648db279076aefd7bcd274
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: If0835a2ac70c1fb73f075c2d90905c5812ddf8f7
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to replicaisland: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie111ad984c9b59235fdff2d4a9716f3e146fb11f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am: 800d69926b am: 8f22f633f2 am: ef1d587b77 -s ours am skip reason: subject contains skip directive Change-Id: Ic297c4a0044b13c67a105611228303d1ddeeb5f1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am: 800d69926b am: 8f22f633f2 Change-Id: I31d0931a7d8145070736cba56b1d90b913297a90
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 12:54:52 +0000