summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-01-28Rename ZoneInfoDB -> ZoneInfoDbandroid-r-preview-1Neil Fuller
Rename ZoneInfoDB -> ZoneInfoDb to conform to coding standards. Bug: 148086409 Test: treehugger Change-Id: I9a0935d359225604c44cde06cfd57119d4532161
2020-01-21Convert to Android.bp am: a7822da616 am: 71da9da58b am: dcecd1f178Automerger Merge Worker
Change-Id: I3f35410e70a00ced6bebaa8a3a4505ed3571e895
2020-01-21Convert to Android.bp am: a7822da616 am: 71da9da58bAutomerger Merge Worker
Change-Id: I1b58f2cac3b88377a950ab45cd38d53de7f32b64
2020-01-21Convert to Android.bpDan Willemsen
am: a7822da616 Change-Id: I843114909576fb9bcd0722f38f454c509acd8e80
2020-01-20Convert to Android.bpDan Willemsen
oem_template was left as an Android.mk for now. It wasn't included during a normal build, and will need some extra work to convert. Bug: 122332476 Bug: 130723131 Test: mmm packages/apps/TimeZoneData Change-Id: Ia53e1f6183389d00badd62cf490be53188b2e95f
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2334006fce am: 9e491b0f25 -s ours am skip reason: subject contains skip directive Change-Id: I406bf89a1f0e1677b2b1d49b02d4956647ca02fd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 2334006fce Change-Id: I7904f404d25be6c757a873700f10f097edf21233
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I6686bf7a577800de807a3bf2ac9612f3996f3420
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8d1c1e6b93 -s ours am: 20d7b4e675 -s ours am: 5a487bbc3f -s ours am skip reason: change_id Id15a0e7908a1feee86bab8cedd06024518107dd5 with SHA1 889541b8d9 is in history Change-Id: If7fc22d216e8be78dda08554d6ba6535f2ecfb46
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8d1c1e6b93 -s ours am: 20d7b4e675 -s ours am skip reason: change_id Id15a0e7908a1feee86bab8cedd06024518107dd5 with SHA1 889541b8d9 is in history Change-Id: I749456031622d8bfd77dc29d951c64dab87ac884
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8d1c1e6b93 -s ours am skip reason: change_id Id15a0e7908a1feee86bab8cedd06024518107dd5 with SHA1 889541b8d9 is in history Change-Id: Ia57f289a49766efedbbe96a996778058d412f2be
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: If970033d0e34638c23811665a834e4d32a64ce96 Merged-In: Id15a0e7908a1feee86bab8cedd06024518107dd5
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
889541b8d9 -s ours am: 1e665d1ee4 am: 4a6a5545d2 am: b0a293738f -s ours am skip reason: subject contains skip directive Change-Id: Ic5e1c3f8f2aaf5f48e722be2a5df64e6750add33
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
889541b8d9 -s ours am: 1e665d1ee4 am: 4a6a5545d2 Change-Id: Ibffff9ca35bc2b2cd4d0efe7cb6b80ebf9277b6b
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
889541b8d9 -s ours am: 1e665d1ee4 Change-Id: Icee19ca831582c3bd0a2912fa006e5adb2d3a93e
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 889541b8d9 -s ours am skip reason: subject contains skip directive Change-Id: I80621ca423026a5ba855b905185c758b5ff3a374
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Id15a0e7908a1feee86bab8cedd06024518107dd5
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 4f703ffaa8 am: 6677caae1a -s ours am skip reason: subject contains skip directive Change-Id: I0a76e8fffcd7ac3873d08522acb96578631e189c
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 4f703ffaa8 Change-Id: Ia918bbf629a9becd1e63df5934152efbd3a5d0e7
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ia54690598ef73f30d106d15817719e6769688b2c
2019-02-25Track RulesManagerService frameworks/base changes am: f4cc71826e am: 732a706905android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseNeil Fuller
am: 4d908688c3 Change-Id: I1b678da3e4aabe2adc2ad6e09b570381690fb047
2019-02-25Track RulesManagerService frameworks/base changes am: f4cc71826eNeil Fuller
am: 732a706905 Change-Id: Ie9a49868290fd8ccaf845fe8cb2704e66e1db9dc
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵Xin Li
stage-aosp-master am: 25dc069c8a -s ours am: cd18025fdd -s ours am skip reason: subject contains skip directive Change-Id: I7fe062276f27f44b1726ed18bc72025c452a4796
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 25dc069c8a -s ours am skip reason: subject contains skip directive Change-Id: I2f06007915b007b5f5e24be31dd660c2b0c1bcde
2019-02-22Track RulesManagerService frameworks/base changesandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Neil Fuller
am: f4cc71826e Change-Id: I13315c6627b089675f35b37cdf882048593ec884
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I72b21d1e5d9fabbdffa3f6451125accd835cc4d0
2019-02-18Track RulesManagerService frameworks/base changesandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseNeil Fuller
Required to support RulesManagerService changes in frameworks/base. Bug: 119293618 Bug: 113373927 Test: See related frameworks/base/ change. Change-Id: Ia9544528ad1d43bfe28a2c162c61d4ebeb186484
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 15:45:12 +0000