summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-02-06Reland: Rework platform version to hide codenames.r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_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_r16aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-b-releaseaml_tz2_305400100Dianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Change-Id: I34ccc9cc6314aeb5babb95302be1801fc9bacd99 Test: manual
2019-11-14Revert submissionKevin Lau Fang
Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336). Change-Id: Ia28aa67a25fdcda1c8634e12cdba0eb6a338bf57
2019-11-11Rework platform version to hide codenames.Dianne Hackborn
The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Test: manual Change-Id: Ie69ffed9d6af6ba0ce8b7b5830634b9b1599292e
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 112664b4ad am: 6a8a6e6420 -s ours am skip reason: subject contains skip directive Change-Id: I3bd6fc2dd9fff0beb512a967d0aee7b66fed6c76
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 112664b4ad Change-Id: Ida722171e070568e33c257ca93c682a8208a9d49
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I5cfba57d9d4d6752313f2ad4938c8d2999a44672
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 9ca2abdb38 -s ↵Xin Li
ours am: 91e1aeb560 -s ours am: 24e0f2211e -s ours am: 76b1c31342 -s ours am skip reason: change_id Ie74cb0199ce4f938f7f3a081967d2102f820423c with SHA1 9d5dd7caab is in history Change-Id: I6074b4403b93d304b64c18b233468c9c2911540e
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 9ca2abdb38 -s ↵Xin Li
ours am: 91e1aeb560 -s ours am: 24e0f2211e -s ours am skip reason: change_id Ie74cb0199ce4f938f7f3a081967d2102f820423c with SHA1 9d5dd7caab is in history Change-Id: I9b2ae055c7d48db445875aa6b152bffb86537238
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 9ca2abdb38 -s oursXin Li
am: 91e1aeb560 -s ours am skip reason: change_id Ie74cb0199ce4f938f7f3a081967d2102f820423c with SHA1 9d5dd7caab is in history Change-Id: I48167020b663acc1f5620280e223d3e9d5c4036b
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: 9ca2abdb38 -s ours am skip reason: change_id Ie74cb0199ce4f938f7f3a081967d2102f820423c with SHA1 9d5dd7caab is in history Change-Id: I1d19ca0aba081f6db1bda1c8b77336a43cab1f02
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: Ica160263b1552dca20eb9b8c27047a5eea357320 Merged-In: Ie74cb0199ce4f938f7f3a081967d2102f820423c
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 9d5dd7caab am: 94b27b1e84Xin Li
am: 2eb8968e5e Change-Id: Ic2ba32ec3301296c512add89cc5db75b16fc3a98
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 9d5dd7caabXin Li
am: 94b27b1e84 Change-Id: I68716bb844772f461dd405d46c333027e67180b9
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 9d5dd7caab Change-Id: I618a3582c3214963b12fbb31b7d32ca2d4a716f2
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: Ie74cb0199ce4f938f7f3a081967d2102f820423c
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c96a461f44 -s ours am: 5cfeebde5c -s ours am: 42347d06d2 -s ours am skip reason: change_id Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3 with SHA1 018b39295e is in history Change-Id: I82c34de658f017797ce09d1c038ac570ad20984d
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c96a461f44 -s ours am: 5cfeebde5c -s ours am skip reason: change_id Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3 with SHA1 018b39295e is in history Change-Id: I1f69c703f65d88cc7bf2caec0220a4817d32ca6b
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c96a461f44 -s ours am skip reason: change_id Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3 with SHA1 018b39295e is in history Change-Id: I8acd14ca76920d0cbb2a84f12958bde39974e959
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: I99ac09bfb8c927ff91ed2c8ae6ac337fe7178133 Merged-In: Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3a13c7ae60 -s ours am: 5d3abb41ee am: eb7e1633f8 am: 8898eb48e0 -s ours am skip reason: subject contains skip directive Change-Id: I4e0254217321e12df9a921a0a72914c71c5c5d5b
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3a13c7ae60 -s ours am: 5d3abb41ee am: eb7e1633f8 Change-Id: If02dc576d1325711e8a97e123fd52cecabd753ca
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3a13c7ae60 -s ours am: 5d3abb41ee Change-Id: I56e634c9798a1a6aed5d7b5925f0bf4850c54452
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 3a13c7ae60 -s ours am skip reason: subject contains skip directive Change-Id: I911bd759592bde9e7890d0ee195e9d4f4833aea0
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 01:26:49 +0000