summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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: ↵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-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
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 Change-Id: I3feb77277d69fc2355bd40fe60bbf370d97f0cfe
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 skip reason: subject contains skip directive Change-Id: I8bb13bd787efb2e174179a1680fb26ecbade5727
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I019d3673b39cf3c75deb8bebe9b838e05dcf83d7
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 am: fdd76bee0c am: 7106431ff0 Change-Id: I3f2b0f7c3139e2c8ec84358f146add087f5bfbbf
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 am: fdd76bee0c Change-Id: Ifc8f95e8319cfe6df7487da58e740b578ff97bbe
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 Change-Id: Icef7bb68163b8d37a11aa9fc622192bdf6929db3
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754aTreehugger Robot
Change-Id: Id50887fb99afe4503cd306f5338ffe0db60cbc7b
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754aTreehugger Robot
Change-Id: Ibb7fe00792b29a9e82492f6e5a7fbaf04b1ee88e
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5cTreehugger Robot
Change-Id: If894db7d4b07d3d2962ffd9a1f70beb0fe299ff7
2020-03-24Merge "Add vts10 suite to existing vts tests"Treehugger Robot
2020-03-24Add vts10 suite to existing vts testsDan Shi
This is to prepare renaming vts to vts10. Bug: 151896491 Test: local build Exempt-From-Owner-Approval: This CL adds all tests in vts to a new suite vts10. vts10 will be the new name of existing vts suite. This CL won't change test logic or behavior. Change-Id: I86e84e4c7ff839197c834eac8c69f3de6e852e72
2019-04-12Merge "Convert Android.mk file to Android.bp" am: 67b20324c8 am: 8ca20f3a0ar_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseSasha Smundak
am: 9d7ae289b1 Change-Id: I717635d51c3e86541be0045a72619f1d69bfe5be
2019-04-12Merge "Convert Android.mk file to Android.bp" am: 67b20324c8android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6ndk-sysroot-r21android10-mainline-resolv-releaseandroid10-mainline-networking-releaseSasha Smundak
am: 8ca20f3a0a Change-Id: I2cabff00c43ae58408c4663bec85426e10dad4ad
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 04:12:25 +0000