summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: fd6d228dd3 -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: e0380edbf3 -s ours am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72859ef364714689cf00d8f7aa754bf62044f8bd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: fd6d228dd3 -s oursXin Li
am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2584bc0345e749088841230eb768ca6a70ea5492
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ia3ec4682c4b6574dd45893ae6502a7057a503c09 Change-Id: I6870a45da003c02131bf680fa747b5cb63041ae4
2020-11-24Mark ab/6881855 as merged am: b61d0ce87d am: 0f25dc4aeaXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13111944 Change-Id: I2194aa7df3ad096b6763a82c061912a636090e30
2020-11-24Mark ab/6881855 as merged am: b61d0ce87dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13111944 Change-Id: Ia3ec4682c4b6574dd45893ae6502a7057a503c09
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ia6d26cd7ad7799f708027491bd3fa584dd6dc9d6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s ours am: ↵Xin Li
c2b8e235a8 -s ours am: 289f1b9319 -s ours am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: I16ae0053f70d84e03e1939726efd9cbe0718fdcf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s ours am: ↵Xin Li
c2b8e235a8 -s ours am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: Ia74bd53535645a9034da0b4848d9f727a7d34262
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9ff9c63183 -s oursXin Li
am skip reason: Change-Id I507e7feae10d28d30e9c5141c1c084aaafa16c76 with SHA-1 01981df37f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12795828 Change-Id: Ib55875e3a706c518ffd8cf9701ac2586e3344085
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I507e7feae10d28d30e9c5141c1c084aaafa16c76 Change-Id: If9e9dd03739dc488c71b5eb087dc02483361ef21
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours am: 0e61a6c001 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: If898a4d1eaa72276c5b23d752680a7a525d3e8ee
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I0a73c7838918a612f6d26e21548771c0fe831d47
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am: f461e8c526 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I1cdf6f3a6a546c79894717cc429c13f5116b6e18
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: ↵Xin Li
c08b383866 -s ours am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: Ib3bc90b76f92522be94dcd5834673a2de144f8c5
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s oursXin Li
am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707 Change-Id: I7121e46731cba28a8270042394374654cef8e154
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Iaee18ba48fc5a8ec511074dd10d69c383e92583b Change-Id: Ie95a9023e5a251cbb5414b16adb92c1dd8ee1e9a
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am: 4411a27f1c -s ours am: 9da45c9680 -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: Iafeff5357c77b8f13cf956b3f56dc09c94056578
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am: 4411a27f1c -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I5e2ef80a75e5be0d3f85603029c6d75fcb61a257
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I9464ba4b79260ad9a612bb9029d380d4304435c3
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978 Change-Id: I733d497507a8dd4efa50f3a14cac900b08d04563
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I34ccc9cc6314aeb5babb95302be1801fc9bacd99 Change-Id: Iaee18ba48fc5a8ec511074dd10d69c383e92583b
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 am: 01981df37f am: 64682837c5 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: I1b97901bbb8a8a8ef347672e9ed9b6dc8f60e176
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: ↵Treehugger Robot
665843167d am: e4bc03637f am: e9e11599bc am: 3a3e355836 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: I4aaf9f804eecdd872f33a147ca37f16ff4063fa8
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 am: 01981df37f Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: Ib2be770fc6e4647f249e894790e68bdb69fea003
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: ↵Treehugger Robot
665843167d am: e4bc03637f am: e9e11599bc Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: I2334ddb6fc3f5968aafcdd6bd1dd6f2d26004600
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: I507e7feae10d28d30e9c5141c1c084aaafa16c76
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: ↵Treehugger Robot
665843167d am: e4bc03637f Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: Ifff70adc5f59374960ff1ae73602c986e47596a7
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 am: d4b1d127f1 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: Idd0220761a6489104356908625074a6636f1b328
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: ↵Treehugger Robot
665843167d Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: Id0d2c325b973ed61298aa92c52d416b6d80f5d76
2020-07-31Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 9083088018 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478 Change-Id: I6024a7994be15a8342b57dd6680f44bb9519b32d
2020-07-31Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936 Change-Id: I4d06189215bd844922bd1addf52ea58b71ee82a9
2020-07-31Merge "Update language to comply with Android’s inclusive language guidance"Treehugger Robot
2020-07-31Merge "Use more inclusive language for #inclusivefixit"Treehugger Robot
2020-07-30Merge "Update language to comply with Android’s inclusive language ↵Amy Zhang
guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 am: 457aacb7a5 am: 37a86c16ff Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754 Change-Id: I4c54f0c9d9ea4e953e959b2c6db455987edab279
2020-07-30Merge "Update language to comply with Android’s inclusive language ↵Amy Zhang
guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 am: 457aacb7a5 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754 Change-Id: I92c6e8f1dcfd9a03d1dd6cea8f4b90761a9fd8d3
2020-07-30Merge "Update language to comply with Android’s inclusive language ↵Amy Zhang
guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754 Change-Id: I4d094ef802fbd57dc0c7e85a44943a444ddf0caf
2020-07-30Merge "Update language to comply with Android’s inclusive language ↵Amy Zhang
guidance" am: 0bb33ab010 am: 27b367fd26 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754 Change-Id: I72370bfecf2115ed3acda3a72a97f0e955218ee2
2020-07-30Merge "Update language to comply with Android’s inclusive language ↵Amy Zhang
guidance" am: 0bb33ab010 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754 Change-Id: I51a6cd24604a2020c89178bff232ef0b4ad8774b
2020-07-30Merge "Update language to comply with Android’s inclusive language guidance"Amy Zhang
2020-07-29Use more inclusive language for #inclusivefixitHongguang Chen
Updating language to comply with Android’s inclusive language guidance. See https://source.android.com/setup/contribute/respectful-code for reference. Bug: 161896447 Change-Id: I77306c682872b5980be11028e004655cd431547f
2020-07-29Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 38f8261975 am: 3998cf6ed7 am: 81df627717 am: 107e59dadf am: 9f9efc2bfe Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1375103 Change-Id: Icc9f23a493168be80064088ba712ac88d5f47da0
2020-07-29Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 38f8261975 am: 3998cf6ed7 am: 81df627717 am: 107e59dadf Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1375103 Change-Id: I7995e0cbc2bba264158705d6cba1d73774a9e0b6
2020-07-29Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 38f8261975 am: 3998cf6ed7 am: 81df627717 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1375103 Change-Id: If1f6788325a20d96e548d027b34d77968584d0a6
2020-07-29Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 38f8261975 am: 3998cf6ed7 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1375103 Change-Id: I0216dd84202ed2bb46fdb2abf66e36876096449b
2020-07-29Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot
guidance" am: 38f8261975 Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1375103 Change-Id: I39737e06e9e79c8f8525f3979e5edc7da5e18f61
2020-07-29Merge "Update language to comply with Android’s inclusive language guidance"Treehugger Robot
2020-07-28Update language to comply with Android’s inclusive language guidanceAmy Zhang
See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Change-Id: Ie8407a8cbbff8e74af9de7b0ff4d4807f0135b90
2020-07-28Update language to comply with Android’s inclusive language guidanceAmy Zhang
See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Change-Id: I8d5b52df9e8d78798e4a4545a7f41a6a503c7528
2020-07-27Update language to comply with Android’s inclusive language guidanceKensuke Miyagi
See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Change-Id: Id378678b487d51c04f02083bf4cd959c47435dff
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 12:51:47 +0000