summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@." am: ↵Treehugger Robot
dd2dc84070 am: f8619e68b5 am: accc4b350e Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1371423 Change-Id: Ie6ab19db6bbb64219175abde4ac5a6ba36d71efc
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@." am: ↵Treehugger Robot
dd2dc84070 am: f8619e68b5 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1371423 Change-Id: I1ad33f57fb8617949c25afe291066f64aef25946
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@." am: dd2dc84070Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1371423 Change-Id: I67239f850e24f4c3dccdf54ff67ccc403356c8db
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@."Treehugger Robot
2020-07-24Remove peteg@ from JSR 305 OWNERS, replace with dauletz@.Pete Gillin
Test: n/a Change-Id: Ibf4f8821314b555d7c700a46c59676f91e3ddc31
2020-06-01[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 99af8ee7a9 am: 9fe096ad55 -s ours am: e1fb9c90b0 -s ours am: ecd511befa -s ours am: 4a0e308bea -s ours am skip reason: Change-Id Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb with SHA-1 459aacf942 is in history Change-Id: If76db194bdd09c964af6f9d24e71796d8bcc20d3
2020-06-01[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 99af8ee7a9 am: 9fe096ad55 -s ours am: e1fb9c90b0 -s ours am: ecd511befa -s ours am skip reason: Change-Id Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb with SHA-1 459aacf942 is in history Change-Id: I760a20ec58d151f2fe6cbc0d634994e8db43d329
2020-06-01[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 99af8ee7a9 am: 9fe096ad55 -s ours am: e1fb9c90b0 -s ours am skip reason: Change-Id Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb with SHA-1 459aacf942 is in history Change-Id: I6df52fcdbe78f687a3e6f8d6074fcf0ae27a692e
2020-06-01[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 99af8ee7a9 am: 9fe096ad55 -s ours am skip reason: Change-Id Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb with SHA-1 459aacf942 is in history Change-Id: I2fa54594714f7ee8fc5010445a85bea8656fefc0
2020-06-01Merge "Set min_sdk_version to be part of mainline modules" am: 99af8ee7a9android-r-beta-3android-r-beta-2Jooyung Han
Change-Id: Ie9b53254387ad90c0c107ca63229b99d8b0347f6
2020-06-01Merge "Set min_sdk_version to be part of mainline modules"Jooyung Han
2020-05-30Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. From the perspective of Mainline modules, min_sdk_version should be equal to or less than "29"(com.android.media). However, quick code-search revealed that the minimum of min_sdk_versions of modules depending on this seems to be 14. Bug: 152655956 Test: m Merged-In: Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb Change-Id: Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb (cherry picked from commit 459aacf9428125a06a2092cc48b14bb3710b49fd)
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
c06187f31d am: 2c190e46f7 am: a8bd6f912c Change-Id: I731ddb0c6831be16b9c8f084a56e8354d1f1f689
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
c06187f31d am: 10767e569f am: 7bb717c1cc Change-Id: I37a7e6b604239fd28df12b3d8195f450473caa7e
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
cabc6faeb7 am: 369ea9c980 am: bf566f8b6c Change-Id: I1f37ad251dca242c5110bfb493619d2144cf5469
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
c06187f31d am: 2c190e46f7 Change-Id: I1bcaf3c959c031c3c35b267b91e16182ce48efd6
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
c06187f31d am: 10767e569f Change-Id: I014f636888b6ccb446b836fa8c49040b790b6751
2020-05-29Set min_sdk_version to be part of mainline modules am: 459aacf942 am: ↵Jooyung Han
cabc6faeb7 am: 369ea9c980 Change-Id: I798a31b3b0f4902a5c743d79a520964540969a52
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942 am: c06187f31dJooyung Han
Change-Id: If01fbbb96d6391fa64755f4f3f66b3bea9b099ea
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942 am: cabc6faeb7Jooyung Han
Change-Id: Ibead4054c7e5d172c67467d6ffcfc5bad80cce0e
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942 am: c06187f31dandroid-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_r18android11-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-d2-releaseJooyung Han
Change-Id: If83ef66ca63cf1e1555bcc2c1e7812f45eae6ef8
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942Jooyung Han
Change-Id: I26cfde52bbf4f50842d9ba8e50e05ba6ecbd1986
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-releaseJooyung Han
Change-Id: I4e574309d523f87f0a4059b9a104873ca8d85f02
2020-05-28Set min_sdk_version to be part of mainline modules am: 459aacf942android-11.0.0_r16android11-d1-b-releaseJooyung Han
Change-Id: I30a5c618d1af82bc30fdfbdcc9104ed24c958b89
2020-05-28Set min_sdk_version to be part of mainline modulesandroid11-devJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. From the perspective of Mainline modules, min_sdk_version should be equal to or less than "29"(com.android.media). However, quick code-search revealed that the minimum of min_sdk_versions of modules depending on this seems to be 14. Bug: 152655956 Test: m Change-Id: Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE" am: af7ab0e434 am: ↵Treehugger Robot
1a39e881dc am: 5c56a7a8a8 am: a4cf89f928 am: 2f87b617d9 Change-Id: If7c9749d5c2ec9b4d770a81e9f1e8a2ecf432fd5
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE" am: af7ab0e434 am: ↵Treehugger Robot
1a39e881dc am: 5c56a7a8a8 am: a4cf89f928 Change-Id: I36e36fe5ea2054f0470edb275f5a21e61b39d116
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE" am: af7ab0e434 am: ↵Treehugger Robot
1a39e881dc am: 5c56a7a8a8 Change-Id: Ic2e7677e82fe9c8ae6f5cea99368f986ad070cfc
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE" am: af7ab0e434 am: ↵Treehugger Robot
1a39e881dc Change-Id: I9619076da5a844f5baf3c2ad98dfc71b32f9af39
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE" am: af7ab0e434Treehugger Robot
Change-Id: I5eb50560883687faf7fecf7d804702afc84e931c
2020-04-29Merge "Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICE"Treehugger Robot
2020-04-28Add METADATA to jsr305: Apache2+BSD+CC-BY=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I989a905eef50bb2d5d8009ff44b7da2dd6f1b1d0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c8ca6ae170 -s ours am: 7a3b38a4f7 am: d88b828324 am: 85713c43c5 -s ours am skip reason: subject contains skip directive Change-Id: Iebcff2336e38ec6f9a71d954df6d10dddfed0c65
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c8ca6ae170 -s ours am: 7a3b38a4f7 am: d88b828324 Change-Id: I1eb9bb687e5eb74e41878d257edefe2bb1f8d835
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c8ca6ae170 -s ours am: 7a3b38a4f7 Change-Id: Ic5ab4da39647e451af83364e78c59747721315d4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c8ca6ae170 -s ours am skip reason: subject contains skip directive Change-Id: I8c4b17953d0e2d73281ddd68a8afd20a6d630ac1
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I6651144be6f4e23c559f178c9c1f769f2a383a39
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67 am: a56be8c2be am: ↵Tobias Thierer
8948fcab50 am: eb27226212 am: 53cee689d6 Change-Id: If3ac1a736b3b7af9205a87c72562eb69aee61f33
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67 am: a56be8c2be am: ↵Tobias Thierer
8948fcab50 am: eb27226212 Change-Id: I7fe5ac33b5444127b13f01915d3531ba5e5a07bb
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67 am: a56be8c2be am: ↵Tobias Thierer
8948fcab50 Change-Id: I8cbdbbf9204e0a65b6da921e9f1eab73c796e870
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67 am: a56be8c2beTobias Thierer
Change-Id: Id18ce075bfae2a5fe4d252869fe4886124464b4b
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67 am: a56be8c2beTobias Thierer
Change-Id: I5ab13bb7db5ae21de872f5fcb2b021c22f2c7186
2020-03-27Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67Tobias Thierer
Change-Id: I73c85a337f77b389d30f66d53f78708dce5e6f8d
2020-03-27Merge "OWNERS: tobiast -> ngeoffray."Tobias Thierer
2020-03-25OWNERS: tobiast -> ngeoffray.Tobias Thierer
This CL topic was created via: find . -name OWNERS | xargs grep -l tobiast | xargs sed \ -i 's/tobiast/ngeoffray/g' Plus appropriate repo start, git commit, repo upload commands: while read proj; do croot $proj ; repo start OWNERS-tobiast-ngeoffray ; \ git commit -F ~/commit-message.txt; croot ; done \ < ~/owners-projects.txt repo upload -t --br=OWNERS-tobiast-ngeoffray No attempt was made to sort the files after the replacement. Test: Manually inspected the result. Bug: 152399425 Change-Id: I2fe47e65defc0c5e00bd95a91b8903f54b78434c
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 7c0b2041e2 -s ours am skip reason: subject contains skip directive Change-Id: Ic5a2e499dc23657360a85aaa041010f6b76bad58
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I89668b3617b0c4833e1dc642701af42aaca7e9dc
2019-01-10Merge "Add default code reviewers into OWNERS" am: d3954f12bb am: 977feb7a69Chih-hung Hsieh
am: 642205c7e7 Change-Id: I61805339fd1b2414c2cebc8ca989c718bb71da68
2019-01-10Merge "Add default code reviewers into OWNERS" am: d3954f12bbChih-hung Hsieh
am: 977feb7a69 Change-Id: I5edab17493697d5b62d1fc12e9babffd46cc5d47
2019-01-10Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: d3954f12bb Change-Id: I0bbfe666d9e75dd44c0dc8ccea271bbe4f8afa7d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 09:02:51 +0000