summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s ↵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-releaseXin Li
ours am: 5c4102760b -s ours am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id58b9aa4d0cf95cf50e6db331b2f84308f443dc9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s oursXin Li
am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75530e12d1ed140166a9d0992559a8e8ed94c6a5
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I3439554b22936589354c8459cfd1cf8c07adad3d Change-Id: I2300bd7019b4a423026e0817b0636799e23a6542
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr305" am: e0ac6e6151 am: ↵Treehugger Robot
7be3367b5a am: af6df3ec18 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1588999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9a0c8503dd00f41dbc7d91f1ca09bf2252a396d7
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr305" am: e0ac6e6151 am: ↵Treehugger Robot
7be3367b5a Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1588999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic02c40fa69642328ca63436519dc577a1f8d58af
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr305" am: e0ac6e6151Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1588999 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0d5069d40804afbea50e309d8be6bb4abe320ab
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsr305"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jsr305Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-CC-BY to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I57d019074beec3e03bd7f5502326f7aacc10db76
2020-11-24Mark ab/6881855 as merged am: dc8112e9cb am: b2558300d9Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/13111558 Change-Id: I7571d24ee15a2d8424ddcd970eef60060638646a
2020-11-24Mark ab/6881855 as merged am: dc8112e9cbXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/13111558 Change-Id: I3439554b22936589354c8459cfd1cf8c07adad3d
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I930620d488f86ec032dc7280988f752faec14191
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 43a823a61a -s ours am: ↵Xin Li
f5e2048939 -s ours am: 4fee9b86b2 -s ours am skip reason: Change-Id Ie6ab19db6bbb64219175abde4ac5a6ba36d71efc with SHA-1 a032e39b04 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12796086 Change-Id: I00264166b57bf736e680558cfa969d75e55b5674
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 43a823a61a -s ours am: ↵Xin Li
f5e2048939 -s ours am skip reason: Change-Id Ie6ab19db6bbb64219175abde4ac5a6ba36d71efc with SHA-1 a032e39b04 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12796086 Change-Id: I56e5c7d8652b3d7fa64e1cba3f426dbc09fc1056
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 43a823a61a -s oursXin Li
am skip reason: Change-Id Ie6ab19db6bbb64219175abde4ac5a6ba36d71efc with SHA-1 a032e39b04 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12796086 Change-Id: I6c3545e69bf5dd6a4ecd8b1f6052c55a7d2e102e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ie6ab19db6bbb64219175abde4ac5a6ba36d71efc Change-Id: I1213aca5cafa1a9b0dfbde28a0cc3d949df1f830
2020-09-14Set min_sdk_version to be part of mainline modules am: 459aacf942 am: 21783c7903Jooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/11570065 Change-Id: Ief8678770d605b8664aef6ecdfcbc48378bb9c7d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 659c3b18c9 -s ours am: 3a05edd0a6 -s ours am: 015b5ee445 -s ours am: 73e975ff36 -s ours am skip reason: Change-Id I2fa54594714f7ee8fc5010445a85bea8656fefc0 with SHA-1 e1fb9c90b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12469815 Change-Id: I8a44188e0899a3c3a4d074bb7adb3d0d7ce9e9b2
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 659c3b18c9 -s ours am: 3a05edd0a6 -s ours am: 015b5ee445 -s ours am skip reason: Change-Id I2fa54594714f7ee8fc5010445a85bea8656fefc0 with SHA-1 e1fb9c90b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12469815 Change-Id: I5cdbd0fbf194fa8f0bb7fddc73a2a8462ccafe7e
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 659c3b18c9 -s ours am: 3a05edd0a6 -s ours am skip reason: Change-Id I2fa54594714f7ee8fc5010445a85bea8656fefc0 with SHA-1 e1fb9c90b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12469815 Change-Id: Ib323c679e9af645ae10b1700ed9dbd848d68564e
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 659c3b18c9 -s ours am skip reason: Change-Id I2fa54594714f7ee8fc5010445a85bea8656fefc0 with SHA-1 e1fb9c90b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/12469815 Change-Id: If825a016fd591b6ba90955a02d28775d37846c0a
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I2fa54594714f7ee8fc5010445a85bea8656fefc0 Change-Id: Iaf229fd7af1621ff75667f806cbbb506bf75850f
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@." am: ↵Treehugger Robot
dd2dc84070 am: f8619e68b5 am: accc4b350e am: a032e39b04 am: a139849dca Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1371423 Change-Id: Ie7abf817a724ddc321660d2b95054bfd98c3dfe7
2020-07-24Merge "Remove peteg@ from JSR 305 OWNERS, replace with dauletz@." am: ↵Treehugger Robot
dd2dc84070 am: f8619e68b5 am: accc4b350e am: a032e39b04 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1371423 Change-Id: I9e6c7e74677ee59c53def2113215b62ad7174005
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 10:54:26 +0000