summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devBob Badour
am: 0461b0a00f am: c02114f3a1 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: Iee5ce96d221cfd7742a8598ec2876fa3ebf6bef9
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵Bob Badour
am: 0461b0a00f Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: If143293f0a523d38d344564be263791519197bd3
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I17ca7593a9f821b9ea08fa88ad7f8efd15513d85
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneDataandroid-s-beta-2android-s-beta-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: oem_template/data_app/build_oem_data_app.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4bc33d7a0ac68d62dbb5688bd01cffac82450423
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s ↵Xin Li
ours am: b4a369c1e1 -s ours am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5f4490ea0c3f67b501283f1a212e521edd14791
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 am: 28877c404e Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I393cd906d20bf5732d71c15bd7fd616b5c9fb275
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s oursXin Li
am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3a0402120c2925c2bd72206e4c751abbf685e76
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ic969718084953876ee910ad057e4cca8645fc25a Change-Id: If2d1a819446f4c98c375369dd9b55fb4b4b23dda
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieca09bd61699d2123eebf6ddcb11bbd2ea5d70b2
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7dBob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib6f15b093ae63b975d22e955c863d56c0cbd8044
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneDataBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp oem_template/data_app_prebuilt/include_app_prebuilt.mk oem_template/xts/Android.mk testing/xts/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5a2f8eddab516fed4eca7995821657fd7785fda4
2020-11-23Mark ab/6881855 as merged am: ea446020ae am: a8c9556a58Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/13113083 Change-Id: I693bd524b5d648a771b42ed61d770ed204e97edc
2020-11-23Mark ab/6881855 as merged am: ea446020aeXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/13113083 Change-Id: Ic969718084953876ee910ad057e4cca8645fc25a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Icc097331325cd6b9e0da7dfd144c3a6b6e98921a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s ours am: ↵Xin Li
363cfd986c -s ours am: d666aba963 -s ours am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: I1d7b37156d915b1e4583f680a8f02e8a9408b585
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s ours am: ↵Xin Li
363cfd986c -s ours am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: Ia5329d7dd5a92d85dfd4b8a186319333884ffe2b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s oursXin Li
am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: Id11251ff6d437afa27ecd8039b345a89b5e556b1
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ife32a6721087b09bd25ee7908e9b7448ae67cd94 Change-Id: I4b35e2843f35ae2513e98a81d949cf77a18bce43
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am: 4737af2aec -s ours am: bac33cae44 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I31bc01d9e3d06bb97b49d88e6b502384766d4d60
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am: 4737af2aec -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I9809849793c99bd57112e920a53cd9b0c3225042
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I26b40bb7fca9b3e8dcf8034380e3d3ef03d3bd69
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: Ie9fb2b34304c127cdd42ceca1cc3ccf3ec8775f4
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I26966830f706b1ca4d7bfc5a05c1425e03132c0a Change-Id: Iabba75102c5597dbcbd199756e857b3e8c15c536
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef am: c9ef2f734c am: 4b5cbb9757 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I69457a95d6c3a033364a0dfcf0dcbba5a9e1739a
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef am: c9ef2f734c Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I2ab8133bb5a9f6a88f5274237a70bf96524c85b9
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: Ife32a6721087b09bd25ee7908e9b7448ae67cd94
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I9f3001a70b93db30653e78e7efd8bf40e8b944ff
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I72d2ff1a3b09b14bc9f0c11ae0e0d6e1d641282c
2020-07-28Merge "Update language to comply with Android's inclusive language guidance"Neil Fuller
2020-07-28Update language to comply with Android's inclusive language guidanceNeil Fuller
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: build only Change-Id: I11d399b3728d5a1d721bac7f5ad0f7210db186cb
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@. am: a92d45930e am: ↵Pete Gillin
4fe183e469 am: d0fe3eca7d am: 538f56cb6b am: 9ce4c15432 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1371424 Change-Id: Ifd2ec983a3366d7b3c7b10c5b55f24cb7a4476e6
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@. am: a92d45930e am: ↵Pete Gillin
4fe183e469 am: d0fe3eca7d am: 538f56cb6b Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1371424 Change-Id: I4006e5a5e7b32ebdd334540ffdd3720c81ccd21b
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@. am: a92d45930e am: ↵Pete Gillin
4fe183e469 am: d0fe3eca7d Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1371424 Change-Id: I1157772381e83f10c91ab76235dce276eb1587e1
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@. am: a92d45930e am: ↵Pete Gillin
4fe183e469 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1371424 Change-Id: Iec621e6754db696abb01cd40966bcbfb21bcdb54
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@. am: a92d45930ePete Gillin
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1371424 Change-Id: If8b396ca29da5b95a651c3c1919c44d4be72643f
2020-07-24Remove peteg@ from TimeZoneData OWNERS, add dauletz@.Pete Gillin
Test: n/a Change-Id: Ia24c4aa393a4511cd91138d73e5826241fd9e403
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f23cfe1347 -s ours am: e56ef6df6d am: 7f5751bc27 am: 83c73dfbdc -s ours am skip reason: subject contains skip directive Change-Id: I17154983760c74d32771b7c47ed52376262d3e76
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f23cfe1347 -s ours am: e56ef6df6d am: 7f5751bc27 Change-Id: Ifdb421f3338c728782e7c49bf32b20428d7d8e29
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f23cfe1347 -s ours am: e56ef6df6d Change-Id: Ib58a51efbb435f000d245bd2076c5fe3420714ef
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f23cfe1347 -s ours am skip reason: subject contains skip directive Change-Id: I26966830f706b1ca4d7bfc5a05c1425e03132c0a
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I3a94814b0ae6a36d8e4e26c8e34f23453eee3810
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2e1c331fc3 -s ours am: 2ddae418ab am: fb304315d2 am: 63f901c829 -s ours am skip reason: subject contains skip directive Change-Id: I112820c6eb9e847a3dbecfbb7080cb5502dac57d
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2e1c331fc3 -s ours am: 2ddae418ab am: fb304315d2 Change-Id: I9e0c2acb7a7288d851b3bc33adb938db8efe0943
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2e1c331fc3 -s ours am: 2ddae418ab Change-Id: I4111694b7524fac50c07f3f8e70152f0f5931bdb
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 2e1c331fc3 Change-Id: I9198f54957b4a593ae63a68c1f52d1ec29e56b4a
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 2e1c331fc3 -s ours am skip reason: subject contains skip directive Change-Id: I747720636a66bdd526ff7d84b2187ec9d3972d1a
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ide43ec73a7933032b8f5048a30deac8f94be6982
2020-01-29Rename ZoneInfoDB -> ZoneInfoDb am: 127ae676e4 am: fe56ba0884 am: 8ca960e539r_aml_301500702android-mainline-12.0.0_r55android-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_r9android-11.0.0_r8android-11.0.0_r7android-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_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
Change-Id: Ia6c368f6f84169694fd1f6a42b3e2463fefe098f
2020-01-29Rename ZoneInfoDB -> ZoneInfoDb am: 127ae676e4 am: fe56ba0884Automerger Merge Worker
Change-Id: Ia005a25b6fd5f66196f92f0092d89e25ee09dc24
2020-01-29Rename ZoneInfoDB -> ZoneInfoDbandroid-r-preview-4android-r-preview-3android-r-preview-2Neil Fuller
am: 127ae676e4 Change-Id: Id4b3d6a1ac415b2e2dfdf012db320830d946fbb4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 21:12:39 +0000