summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 152fe81f90facc5a1074d801b30f253b2949903d to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I2bd3b694c0e27c9b9db4fd7a1820b97543c4a01c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6cc4491a0c -s ↵android-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-devXin Li
ours am: 461b6becbe -s ours am skip reason: Change-Id If5ae74f91003e5833867f94b4b1c5cee4ee08206 with SHA-1 aefbc692ad is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I743ce25b43b75e9c2ee24580749a292608d16313
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6cc4491a0c -s oursXin Li
am skip reason: Change-Id If5ae74f91003e5833867f94b4b1c5cee4ee08206 with SHA-1 aefbc692ad is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6bc00d3a80673fd00d2d9f2aa4c9181480eda070
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: If5ae74f91003e5833867f94b4b1c5cee4ee08206 Change-Id: Ie642e9e49784f65308deee9eccaeaeb7450a93bb
2020-11-24Snap for 6991517 from fffe31d017b511f94fdbde037adc1c7ade064fcc to sc-d1-releaseandroid-build-team Robot
Change-Id: Ib95fa6775b8c544519b868791cba0ea6d9654f71
2020-11-24Mark ab/6881855 as merged am: 078bc118fa am: aefbc692adXin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/13112567 Change-Id: Ifaf634484d1c2bf84020565e216c472954854282
2020-11-24Mark ab/6881855 as merged am: 078bc118faXin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/13112567 Change-Id: If5ae74f91003e5833867f94b4b1c5cee4ee08206
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I94c628e56fb6fb8e7fc5c3e46ce72dd2362299e3
2020-10-11Snap for 6897674 from be590b33c73260b6ca7a9d209a607ab044807ec7 to sc-d1-releaseandroid-build-team Robot
Change-Id: Iadcf312521642efe518a375cfd587f435df8a93e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2735ac947a -s ours am: ↵Xin Li
c2fb251e75 -s ours am: dd2361bdad -s ours am: c65b0ff6fe -s ours am skip reason: Change-Id Ia07654af55d2da376c43d23fc5dcdee87e43264b with SHA-1 0712efa825 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12796855 Change-Id: Ia1f68f50aa7e14f0c258e4220077b3172ac54998
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2735ac947a -s ours am: ↵Xin Li
c2fb251e75 -s ours am: dd2361bdad -s ours am skip reason: Change-Id Ia07654af55d2da376c43d23fc5dcdee87e43264b with SHA-1 0712efa825 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12796855 Change-Id: I7664f3167fb563b430741290a27442d96992a33e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2735ac947a -s ours am: ↵Xin Li
c2fb251e75 -s ours am skip reason: Change-Id Ia07654af55d2da376c43d23fc5dcdee87e43264b with SHA-1 0712efa825 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12796855 Change-Id: I1c22bd452d8dbd99e9ce27e82c62517e07a267c6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2735ac947a -s oursXin Li
am skip reason: Change-Id Ia07654af55d2da376c43d23fc5dcdee87e43264b with SHA-1 0712efa825 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12796855 Change-Id: Ib0128d26efa75d8e969ff344e8416872ef3d960a
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia07654af55d2da376c43d23fc5dcdee87e43264b Change-Id: I32711cd42b84baa905a981c4def2bf1ebb0b853a
2020-09-13Snap for 6830825 from 75c0fade49cab06a191e309c6ca66b43f9da02e0 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ic2f7871cd15b2ee2128b46f9667482a18393a2f9
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e ↵Xin Li
-s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours am: 87c4a93002 -s ours am: 8ba116a1c4 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: If6054743168e340cc44ad18eb161d8d4762b59e3
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e ↵Xin Li
-s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours am: 87c4a93002 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I4ec34d1f2245a783f042e5a877c3008854109ca2
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e ↵Xin Li
-s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: Ia8b2b0b1374a5bbaa8585f6d85e1e2351c40d5d7
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e ↵Xin Li
-s ours am: f31d1ca5a0 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I2b455ac40d5cbaa52b3c3ded8765d660c31ce154
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e ↵Xin Li
-s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I6345cd66afb96337d159eb7b1110d9af0ee006fe
2020-09-11[automerger skipped] Merge Android R am: 785c2bcbe6 -s oursXin Li
am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: I4219c7db871e5f96237aaf4fb71435ac48346e0a
2020-09-10Snap for 6824083 from 72fc8f83001ec7480ed4d3ba41ae5a507dfef42b to sc-d1-releaseandroid-build-team Robot
Change-Id: Id37cbe059a3dc6210be3d1011e1e7694b8c73ff3
2020-09-09Remove libsurfaceflinger from product packages am: 9015e0f59bJohn Reck
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12542808 Change-Id: I176819e9883a3e7d62bd1b89effb00628a10615d
2020-09-09Remove libsurfaceflinger from product packagesJohn Reck
This is a generic dependency of surfaceflinger and doesn't need to be listed here explicitly. libsurfaceflinger is also going away Bug: 168077202 Test: none Change-Id: I4a210e0021324b7dfeb6bca18a19ee0747a9184b
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 Change-Id: Id4aafe6db6de091cfeea110a998b946f97d68c69
2020-09-03Snap for 6810044 from 3435d3e6f37b2891fc38822f0bc2aa36dbdbcec3 to sc-d1-releaseandroid-build-team Robot
Change-Id: I7b31678c1eb34dcb7ca6c4a1413c67fb82bf352e
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7aaaa718a -s ours am: 10ca997a5f -s ours am: cad904726d -s ours am: ee2f302e99 -s ours am: 2a0176594d -s ours am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108 Change-Id: Ib3798f158aab92071be12d29dbec0a320f687495
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7aaaa718a -s ours am: 10ca997a5f -s ours am: cad904726d -s ours am: ee2f302e99 -s ours am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108 Change-Id: Ic84ee396300d526a3c23cc35f027611071f11211
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7aaaa718a -s ours am: 10ca997a5f -s ours am: cad904726d -s ours am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108 Change-Id: I0856f92903a715219e43fb3f57a355d8d546fbbf
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7aaaa718a -s ours am: 10ca997a5f -s ours am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108 Change-Id: Ia03ed4bcdd72a85a8bf2b3ca76770a2195958995
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7aaaa718a -s ours am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108 Change-Id: Id7d4e763b2027c7b0ffda930c623ba956f72faca
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 Change-Id: Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4
2020-05-06Snap for 6464930 from 0d316368bcd8ee417835e2e97850d0a50064009f to sc-d1-releaseandroid-build-team Robot
Change-Id: I77ba18c7d1fd7f8debf046e55f786c27fdbec087
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6 am: a82bd5ee8e am: ↵Bob Badour
1145d068a8 am: 0712efa825 am: 757b6f1737 am: b2c61b8a91 Change-Id: Idc331e61340bbe37eb334d4f945e64195e09c24a
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6 am: a82bd5ee8e am: ↵Bob Badour
1145d068a8 am: 0712efa825 am: 757b6f1737 Change-Id: I71b361d234c8430e3e5285b3fa6e1b05fba6d957
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6 am: a82bd5ee8e am: ↵Bob Badour
1145d068a8 am: 0712efa825 Change-Id: I93dcc1ef388a980ac7ccb43ea1104463c1468f3d
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6 am: a82bd5ee8e am: 1145d068a8Bob Badour
Change-Id: Ia07654af55d2da376c43d23fc5dcdee87e43264b
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6 am: a82bd5ee8eBob Badour
Change-Id: I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1
2020-05-05Add METADATA to uml: Apache2=NOTICE am: 12d2a04ea6android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ic761c4d22b8db6ed1ace3bdb33b9ad6c40de126f
2020-05-01Add METADATA to uml: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I170ddbfa9be3ef3e758a84e058e250cbabad3e00
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0290a545f8 -s ours am: 0e1415078d am: 6b125ca55f am: 543c5579b1 -s ours am: 330c88443b Change-Id: I4ce8a2cf00bdc5ab3a7a7b6db8d6e2040f022668
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0290a545f8 -s ours am: 0e1415078d am: 6b125ca55f am: 543c5579b1 -s ours am skip reason: subject contains skip directive Change-Id: I628510a10caa5fb9034cf21f3e3fa941a33551ee
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0290a545f8 -s ours am: 0e1415078d am: 6b125ca55f Change-Id: I78026c92fa1c13676046e12193116118a7c6d81d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0290a545f8 -s ours am: 0e1415078d Change-Id: I4f51127c6fd3190c70e86b4b37fc3c530168d29e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0290a545f8 -s ours am skip reason: subject contains skip directive Change-Id: Ieea93332aeffe3ea30d4df36a4bb991350bfd2b7
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I677ea520ed1cf0caed7097cb317c29eaddd03458
2020-03-26adbd is not available for platform am: 72c2547334 am: 4cb37b29a5 am: ↵Jiyong Park
0bb5afc584 am: ac38aa2027 am: 6f8e64e450 Change-Id: I1090a3756414584c5df2991868133b18840148ff
2020-03-26adbd is not available for platform am: 72c2547334 am: 4cb37b29a5 am: ↵Jiyong Park
0bb5afc584 am: ac38aa2027 Change-Id: Ie06007e12c97c1c1b1fd44b7f92655e47800e55b
2020-03-26adbd is not available for platform am: 72c2547334 am: 4cb37b29a5 am: 0bb5afc584Jiyong Park
Change-Id: I1b26103145701354fc28ee48a31d2ae1a11eb8ce
2020-03-26adbd is not available for platform am: 72c2547334 am: 4cb37b29a5Jiyong Park
Change-Id: Ifb7a3f3f0d626f3afbd196f839da6e8467948a36
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 08:48:55 +0000