)]}' { "log": [ { "commit": "0470df3d38d8e08932ebbe08b3d8ec9bbdcd403f", "tree": "87d174d3a76aaa6ea3dce17717d4ca7d4ef2fcd7", "parents": [ "b22c811c89ab73d3d818176ce59ec823dfd61bc1", "b69851395102f40385d771f48e84a4023c72b6e4" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Feb 26 08:18:43 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 26 08:18:43 2025 -0800" }, "message": "Fix TimeZoneVersionTest failures on pre-V devices. am: b698513951\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3505500\n\nChange-Id: I8e07969b9bbffb55bcbc59477ab9f782b82de316\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b69851395102f40385d771f48e84a4023c72b6e4", "tree": "87d174d3a76aaa6ea3dce17717d4ca7d4ef2fcd7", "parents": [ "956c702d0eeb112fa5548022cb694a03111c352b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Feb 25 16:02:47 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Feb 26 10:08:26 2025 +0000" }, "message": "Fix TimeZoneVersionTest failures on pre-V devices.\n\nBug: 399050667\nTest: presubmit\nTest: atest MtsTimeZoneDataTestCases passes on R, S, T and U devices\nChange-Id: I34343e84aa2376f30c47f805283e951b5e4eda03\n" }, { "commit": "b22c811c89ab73d3d818176ce59ec823dfd61bc1", "tree": "43c88c0c23cd3689d165631dd86d49e8b5a0276f", "parents": [ "ed43b7c848be33177f50d88b36106d08e0284b99", "956c702d0eeb112fa5548022cb694a03111c352b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Feb 14 04:30:59 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 14 04:30:59 2025 -0800" }, "message": "Update \"relative_install_path\"s after major version bump. am: 956c702d0e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3495030\n\nChange-Id: I4a1eaae9440d681b57a6dd8be72d6ee11dfd02a7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "956c702d0eeb112fa5548022cb694a03111c352b", "tree": "43c88c0c23cd3689d165631dd86d49e8b5a0276f", "parents": [ "759b415f361e402e3eff0d62b39c5c991dca4627" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 17:50:01 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 17:50:01 2025 +0000" }, "message": "Update \"relative_install_path\"s after major version bump.\n\nBug: 383096413\nTest: presubmit\nChange-Id: I1136c09a8cc103f87f307d8dd34a21405cca8257\n" }, { "commit": "ed43b7c848be33177f50d88b36106d08e0284b99", "tree": "377add2f40f038923d85884f587baab1c9547566", "parents": [ "9dd2588e712b5299b9a3d8b6c4ecb3054da6c5da", "759b415f361e402e3eff0d62b39c5c991dca4627" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 06:09:25 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 06:09:25 2025 -0800" }, "message": "Merge \"Mention libandroidicuinit\u0027s MAJOR_FORMAT_VERSION.\" into main am: 759b415f36\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3492435\n\nChange-Id: I32db4fefcb42bd34f229befd4cba264d6c9ac8bd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "759b415f361e402e3eff0d62b39c5c991dca4627", "tree": "377add2f40f038923d85884f587baab1c9547566", "parents": [ "1742467dcf2df573414b641f49ad84321c72ebc8", "a75dc92dc5ddeb52bcea8e887beacafd7d17dd39" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 05:47:34 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 13 05:47:34 2025 -0800" }, "message": "Merge \"Mention libandroidicuinit\u0027s MAJOR_FORMAT_VERSION.\" into main" }, { "commit": "9dd2588e712b5299b9a3d8b6c4ecb3054da6c5da", "tree": "7bb792a08f8cf72a77bcf932c3a539d4a3e22bc9", "parents": [ "7dedbab46c897a47162ad142a0e9421c6ef672bb", "1742467dcf2df573414b641f49ad84321c72ebc8" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 04:11:30 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 04:11:30 2025 -0800" }, "message": "Run more tests in postsubmit. am: 1742467dcf\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3492470\n\nChange-Id: I19bdd2990e5517b911f6c4eaccb0289b9ea6fdbd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a75dc92dc5ddeb52bcea8e887beacafd7d17dd39", "tree": "feca915f1907962007d994b05222d1a1fa49fba1", "parents": [ "7604579a162702844f6c384236ec3f28ecbb7a2a" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 11:16:53 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 13 11:16:53 2025 +0000" }, "message": "Mention libandroidicuinit\u0027s MAJOR_FORMAT_VERSION.\n\nBug: 383096413\nTest: n/a\nChange-Id: Iccf5f06f35ea702f37bc79cafa91690fd5b41d06\n" }, { "commit": "1742467dcf2df573414b641f49ad84321c72ebc8", "tree": "7bb792a08f8cf72a77bcf932c3a539d4a3e22bc9", "parents": [ "7604579a162702844f6c384236ec3f28ecbb7a2a" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Feb 12 14:56:40 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Feb 12 14:57:39 2025 +0000" }, "message": "Run more tests in postsubmit.\n\nThese are the tests we run in each time zone update.\n\nBug: 383977133\nTest: n/a\n\nChange-Id: I12950477ec4226b3c3d6e83264b48c43c1328e48\n" }, { "commit": "7dedbab46c897a47162ad142a0e9421c6ef672bb", "tree": "270a0b884e7361504e07b33c7c34ee024f119c79", "parents": [ "19e7ddeab797225ce2b4337e91fb57ce0adb3f4a", "7604579a162702844f6c384236ec3f28ecbb7a2a" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Feb 10 06:21:21 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 10 06:21:21 2025 -0800" }, "message": "Run MtsTimeZoneDataTestCase as part of presubmit. am: 7604579a16\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3485654\n\nChange-Id: I9c6159d61bc1ea0c3185bbbe217f4ba14c7d2aff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7604579a162702844f6c384236ec3f28ecbb7a2a", "tree": "270a0b884e7361504e07b33c7c34ee024f119c79", "parents": [ "e59a80fb33b139e9ce7be125e4525171be3baaca" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Feb 10 12:15:11 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Feb 10 12:15:11 2025 +0000" }, "message": "Run MtsTimeZoneDataTestCase as part of presubmit.\n\nBug: 383977133\nTest: atest runs it\nChange-Id: I0489fba7a307e1aa42a179c1809242ecb62d7bf4\n" }, { "commit": "19e7ddeab797225ce2b4337e91fb57ce0adb3f4a", "tree": "8fb48ba6d5eaf7f5929f0248842b554674ced4b4", "parents": [ "ffbaa46cdb750835d6285373eaf81da00f59f2c5", "e59a80fb33b139e9ce7be125e4525171be3baaca" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Feb 04 08:17:30 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 08:17:30 2025 -0800" }, "message": "Merge \"Update Android TZDB from 2024b to 2025a.\" into main am: e59a80fb33\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3463532\n\nChange-Id: I8a78ee4fde1c2bf4d12751cef2cd0fe512977510\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e59a80fb33b139e9ce7be125e4525171be3baaca", "tree": "8fb48ba6d5eaf7f5929f0248842b554674ced4b4", "parents": [ "106b112be8f613935936cd6ffd72574f66d86b9c", "2728003edbb993c04142874887a051b9d75783d4" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Feb 04 07:49:43 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 04 07:49:43 2025 -0800" }, "message": "Merge \"Update Android TZDB from 2024b to 2025a.\" into main" }, { "commit": "ffbaa46cdb750835d6285373eaf81da00f59f2c5", "tree": "953c3441c05a6282d62e3a058d0dc2c6e9e1f8a4", "parents": [ "a24f21fb5304e7a2e6aa466714e96de335c78e38", "106b112be8f613935936cd6ffd72574f66d86b9c" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Jan 30 03:03:36 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 30 03:03:36 2025 -0800" }, "message": "Update TimeZoneVersionTest. am: 106b112be8\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3466492\n\nChange-Id: I677f1aa375b140e323c42c8bdee4e6856da6cee1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "106b112be8f613935936cd6ffd72574f66d86b9c", "tree": "953c3441c05a6282d62e3a058d0dc2c6e9e1f8a4", "parents": [ "0eea93ad3089675283649b3e83d749c18abb944b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jan 29 11:50:54 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jan 29 15:47:59 2025 +0000" }, "message": "Update TimeZoneVersionTest.\n\nNow it takes into account that tzdata module has files for\ndifferent major versions and checks that data is consistent.\n\nNO_IFTTT\u003dIntroducing the check\n\nBug: 390855688\nTest: atest MtsTimeZoneDataTestCases on aosp/main and V\nChange-Id: Ic236bc39edd8edd6cc599688136b1b11443515c9\n" }, { "commit": "2728003edbb993c04142874887a051b9d75783d4", "tree": "523fd7c12ec27ea8cb4af4126e1f9d40f183644b", "parents": [ "0eea93ad3089675283649b3e83d749c18abb944b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jan 24 14:28:00 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jan 24 14:36:58 2025 +0000" }, "message": "Update Android TZDB from 2024b to 2025a.\n\nNotes for Android time zone maintainers:\nLike all tzdb updates, the binary files in this commit should not be\npatched to other release branches: they are not guaranteed to work.\nAlso note that there are associated changes in external/icu and often\nothers that should also be applied. tzdb updates are incremental\nchanges: all previous tzdb updates should be applied. Look for\naosp/\u003crelease\u003e-dev changes for backports. If you have a local branch\nwith ICU changes the ICU .dat file in external/icu will not apply\ncleanly. Instead, make equivalent changes to text files and run\nsystem/timezone/update-tzdata.py.\n\n---------------\n\nIANA release 2025a notes:\n Paraguay adopted permanent -03 starting spring 2024.\n Improve pre-1991 data for the Philippines.\n Etc/Unknown is now reserved.\n\nBug: 390423801\nTest: run cts --include-filter CtsLibcoreTestCases\nTest: run cts --include-filter CtsLibcoreOjTestCases\nTest: run cts --include-filter CtsIcuTestCases\nTest: run cts --include-filter CtsBionicTestCases\nTest: run cts --include-filter CtsTextTestCases\nTest: atest MtsTimeZoneDataTestCases\nTest: \"adb shell dumpsys runtime\" reports 2025a\n\nChange-Id: I54f51c818f4431eb0fbd9a87c2c37e1a5ba881e5\nMerged-In: I54f51c818f4431eb0fbd9a87c2c37e1a5ba881e5\n" }, { "commit": "a24f21fb5304e7a2e6aa466714e96de335c78e38", "tree": "729f7526af9a5dc7076dbce28618677883c892b2", "parents": [ "f2539ea92bd21c403c4d220f0a6eb431403e07bd", "0eea93ad3089675283649b3e83d749c18abb944b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jan 17 08:19:04 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 08:19:04 2025 -0800" }, "message": "Created versioned/9 directory in tzdata module. am: 0eea93ad30\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3412798\n\nChange-Id: Ia54dc3620ce69ce222530ec91f651a01d5b35268\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0eea93ad3089675283649b3e83d749c18abb944b", "tree": "729f7526af9a5dc7076dbce28618677883c892b2", "parents": [ "db32193e80f3449cb66023043b6269672266ce74" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Dec 13 17:46:29 2024 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jan 13 11:23:44 2025 +0000" }, "message": "Created versioned/9 directory in tzdata module.\n\nPreparation for the upcoming ICU update.\nThe way tz_version is created is ad-hoc, that will be addressed\nlater.\n\nExcept /apex/com.android.tzdata/etc/tz/versioned/8/tz_version,\ntz_version uses 008 as the major version. The other files are identical.\n/apex/com.android.tzdata/etc/tz/tz_version\n/system/usr/share/zoneinfo/tz_version/tz_version\n/apex/com.android.tzdata/etc/tz/versioned/9/tz_version\n\nBug: 383096413\nTest: device boot, files are present in /apex/com.android.tzdata\nChange-Id: Icf65b182e088c797bbcbda3ccb68813121dc1824\n" }, { "commit": "f2539ea92bd21c403c4d220f0a6eb431403e07bd", "tree": "bfb3b155ed8ab8090ca02070658a9bfcb677f3a9", "parents": [ "2121d118051e0300a6294cd4b7bf4e7b972f51fc", "db32193e80f3449cb66023043b6269672266ce74" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jan 13 02:23:19 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 13 02:23:19 2025 -0800" }, "message": "Update MTS\u0027s TimeZoneRulesTest. am: db32193e80\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3447208\n\nChange-Id: I596409ab8ba442b60496af64e5696be5a96ccf95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "db32193e80f3449cb66023043b6269672266ce74", "tree": "bfb3b155ed8ab8090ca02070658a9bfcb677f3a9", "parents": [ "214a72668dec33f533041746bd938dbde97961e7" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jan 10 13:01:03 2025 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jan 10 13:01:03 2025 +0000" }, "message": "Update MTS\u0027s TimeZoneRulesTest.\n\nIn 2024b CET was marked as an alias to Europe/Brussels, hence\nminor timestamp update.\n\nBug: 385436687\nBug: 383977133\n\nTest: atest MtsTimeZoneDataTestCases\nChange-Id: I4636970e2fea2ccd164a9888732139025b177ccf\n" }, { "commit": "2121d118051e0300a6294cd4b7bf4e7b972f51fc", "tree": "74678944c740706309d107ba8e159ff9bf39d48f", "parents": [ "56c1cb23e1beb0723b0264fdd45122449a16ca00", "36de58e2bdbb97e7b6322495ab417cbbafeabb42" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:46 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:46 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I9b835abb90e619588f21d76ffd82cade5b40c658\nChange-Id: Iab0c55279adfeba89f426295a2e7044824d0181d\n" }, { "commit": "56c1cb23e1beb0723b0264fdd45122449a16ca00", "tree": "74678944c740706309d107ba8e159ff9bf39d48f", "parents": [ "322da1873076635bafe92d12a0c973d02ada360f", "214a72668dec33f533041746bd938dbde97961e7" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Tue Dec 17 04:01:39 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 04:01:39 2024 -0800" }, "message": "Merge \"Update Android TZDB from 2024a to 2024b\" into main am: 214a72668d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3412917\n\nChange-Id: I3fabfad01ce2446a0d15caee02da6545b8083b66\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "214a72668dec33f533041746bd938dbde97961e7", "tree": "74678944c740706309d107ba8e159ff9bf39d48f", "parents": [ "322da1873076635bafe92d12a0c973d02ada360f", "41b6a92bd1f19c022106f35c817fc83b7b94c584" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Tue Dec 17 03:30:39 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 17 03:30:39 2024 -0800" }, "message": "Merge \"Update Android TZDB from 2024a to 2024b\" into main" }, { "commit": "41b6a92bd1f19c022106f35c817fc83b7b94c584", "tree": "74678944c740706309d107ba8e159ff9bf39d48f", "parents": [ "752c7fcf1c6f946827da37eda74c01c6a93f161a" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Dec 13 12:28:39 2024 +0000" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Dec 13 17:30:00 2024 +0000" }, "message": "Update Android TZDB from 2024a to 2024b\n\nBug: 383977133\nTest: update-tzdata.py\nChange-Id: Ia4aa7442e35bfe50c1d606d4a6537d3a90f6431c\n" }, { "commit": "36de58e2bdbb97e7b6322495ab417cbbafeabb42", "tree": "707664a8d72e8767e98c06e5f07357557b2dde1d", "parents": [ "b7acc04466207ccdef583ebeac53b94829e06d92", "322da1873076635bafe92d12a0c973d02ada360f" ], "author": { "name": "Geoffrey Boullanger", "email": "boullanger@google.com", "time": "Fri Nov 08 17:33:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 17:33:31 2024 +0000" }, "message": "Added MCC mappings to the telephony lookup file am: 752c7fcf1c am: 322da18730\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3326205\n\nChange-Id: I3c7f1cf980d109764be99354d2a504848bda9ca6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "322da1873076635bafe92d12a0c973d02ada360f", "tree": "707664a8d72e8767e98c06e5f07357557b2dde1d", "parents": [ "b7acc04466207ccdef583ebeac53b94829e06d92", "752c7fcf1c6f946827da37eda74c01c6a93f161a" ], "author": { "name": "Geoffrey Boullanger", "email": "boullanger@google.com", "time": "Fri Nov 08 17:11:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 17:11:31 2024 +0000" }, "message": "Added MCC mappings to the telephony lookup file am: 752c7fcf1c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3326205\n\nChange-Id: I39cbde2a73a500a9041743fb022019f886dbb3ce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "752c7fcf1c6f946827da37eda74c01c6a93f161a", "tree": "707664a8d72e8767e98c06e5f07357557b2dde1d", "parents": [ "be73f925bf5765f0645077bf6af513d05ce902d0" ], "author": { "name": "Geoffrey Boullanger", "email": "boullanger@google.com", "time": "Fri Nov 08 10:58:38 2024 +0000" }, "committer": { "name": "Geoffrey Boullanger", "email": "boullanger@google.com", "time": "Fri Nov 08 16:22:22 2024 +0000" }, "message": "Added MCC mappings to the telephony lookup file\n\nAssociating MCC/MNC to Region as we do today is lossy and does not reflect the reality that MCCs can be used in multiple regions.\n\nSee more details: go/mcc-table-mainline\n\nBug: 376493245\nTest: manually checked that the device boots normally on Android V and at head\nTest: atest /system/timezone/input_tools/android/telephonylookup_generator/src/test/java/com/android/libcore/timezone/telephonylookup/TelephonyLookupGeneratorTest.java\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6aa64e49cd49bb3e4e24af81e11dc7c6a487ba08)\nMerged-In: Ibc7acfd3ed86cdcee3e7f7d930d11e1fac8a72e0\nChange-Id: Ibc7acfd3ed86cdcee3e7f7d930d11e1fac8a72e0\n" }, { "commit": "b7acc04466207ccdef583ebeac53b94829e06d92", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "0edcc98d14a66ed27b2e2fa486c5f36de6111d6a", "5b472d6de22689f1dbb6062e7f1249b8dad5ea52" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:11:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:11:45 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: be73f925bf -s ours am: 5b472d6de2 -s ours\n\nam skip reason: Merged-In I07432e1683b38a0d29df1e62c71380646963314e with SHA-1 567f2419c4 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3258500\n\nChange-Id: I296eb841f0920278e0900fb82980fffbc864a71f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0edcc98d14a66ed27b2e2fa486c5f36de6111d6a", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "105155d7ffd2ad8dc36d3665eab8fc3ce5267b05", "0c1e8536246a14b915cb95e40bab5bcafabea0ec" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:11:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:11:42 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 23539ea642 -s ours am: 0c1e853624 -s ours\n\nam skip reason: Merged-In I07432e1683b38a0d29df1e62c71380646963314e with SHA-1 567f2419c4 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3258500\n\nChange-Id: I1e4fec0b6a0d0ac96036de90782d4ce531a53f70\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5b472d6de22689f1dbb6062e7f1249b8dad5ea52", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "0c1e8536246a14b915cb95e40bab5bcafabea0ec", "be73f925bf5765f0645077bf6af513d05ce902d0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:19:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:19:18 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: be73f925bf -s ours\n\nam skip reason: Merged-In I07432e1683b38a0d29df1e62c71380646963314e with SHA-1 567f2419c4 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3258500\n\nChange-Id: Ib99f1ed6efb07089627d59ff0c573f39ed0d0b6b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c1e8536246a14b915cb95e40bab5bcafabea0ec", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "d4e7a04072720d8fd9f44e4d8005639d6b788938", "23539ea64298adb11fddca392e8359175107a486" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:19:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:19:15 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 23539ea642 -s ours\n\nam skip reason: Merged-In I07432e1683b38a0d29df1e62c71380646963314e with SHA-1 567f2419c4 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3258500\n\nChange-Id: I4614da6fcfc2c64df0b1c5aa6672d081b829dd27\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be73f925bf5765f0645077bf6af513d05ce902d0", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "a7ed527d30496679f3c8ddcf2f088f4ff63658a4", "23539ea64298adb11fddca392e8359175107a486" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:12:13 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Sep 07 01:12:13 2024 +0000" }, "message": "Merge \"Merge 24Q3 to AOSP main\" into main" }, { "commit": "105155d7ffd2ad8dc36d3665eab8fc3ce5267b05", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "b4523047d5dda6556168282439dc2e11304536a9", "d4e7a04072720d8fd9f44e4d8005639d6b788938" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Sep 06 10:22:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 10:22:13 2024 +0000" }, "message": "Revert^2 \"Add MCC/MNC override for American Samoa.\" am: a7ed527d30 am: d4e7a04072\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3247092\n\nChange-Id: Ida53768824a02865cc1c63fab1ecd6c9b810dc42\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d4e7a04072720d8fd9f44e4d8005639d6b788938", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "5782b2b4ff259852ebe43fa9c1c9852a5061c00f", "a7ed527d30496679f3c8ddcf2f088f4ff63658a4" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Sep 06 09:59:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 09:59:26 2024 +0000" }, "message": "Revert^2 \"Add MCC/MNC override for American Samoa.\" am: a7ed527d30\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3247092\n\nChange-Id: I436493f3d5b53c4284ed4230c04e24f6a421469e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "23539ea64298adb11fddca392e8359175107a486", "tree": "be0429f84b0210ffd8b5aeaf56527debb61dd86f", "parents": [ "74b50a6641e7183a7e536e5bb78e630f96121663", "5782b2b4ff259852ebe43fa9c1c9852a5061c00f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:08 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:08 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I07432e1683b38a0d29df1e62c71380646963314e\nChange-Id: I9c8c512529e6cc1fd55fdee25f4febf9b785ce10\n" }, { "commit": "a7ed527d30496679f3c8ddcf2f088f4ff63658a4", "tree": "b26b4d5cf1eafccee7f992d8e95faae2398fb6e5", "parents": [ "74b50a6641e7183a7e536e5bb78e630f96121663" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Aug 28 08:10:15 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 28 08:10:15 2024 +0000" }, "message": "Revert^2 \"Add MCC/MNC override for American Samoa.\"\n\nThis reverts commit 74b50a6641e7183a7e536e5bb78e630f96121663.\n\nReason for revert: AT\u0026T request\n\nChange-Id: Ia5736bfc0bf03ddaea19333f5a8c55d56b4ebc65\n" }, { "commit": "b4523047d5dda6556168282439dc2e11304536a9", "tree": "be0429f84b0210ffd8b5aeaf56527debb61dd86f", "parents": [ "d38f55ab0f5662d7193247eeea8d7dc10c45490b", "5782b2b4ff259852ebe43fa9c1c9852a5061c00f" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Aug 16 10:21:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 16 10:21:39 2024 +0000" }, "message": "Revert \"Add MCC/MNC override for American Samoa.\" am: 74b50a6641 am: 5782b2b4ff\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3223082\n\nChange-Id: Ia88aeeb1b962243041750fd64277e2932bcb10dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5782b2b4ff259852ebe43fa9c1c9852a5061c00f", "tree": "be0429f84b0210ffd8b5aeaf56527debb61dd86f", "parents": [ "4fa4700591061643a7ee71607210ed4a99a5978d", "74b50a6641e7183a7e536e5bb78e630f96121663" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Aug 16 10:05:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 16 10:05:24 2024 +0000" }, "message": "Revert \"Add MCC/MNC override for American Samoa.\" am: 74b50a6641\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3223082\n\nChange-Id: I8e3c46b4e1d5778f19b0f3085a39b57ec92c8765\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "74b50a6641e7183a7e536e5bb78e630f96121663", "tree": "142fd0189778f465301b8028ac766d2e8a4fa1ac", "parents": [ "70d9fa487a84480a0bf41db1ae734fca5a600f4d" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Aug 16 08:19:19 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 16 08:19:19 2024 +0000" }, "message": "Revert \"Add MCC/MNC override for American Samoa.\"\n\nThis reverts commit 70d9fa487a84480a0bf41db1ae734fca5a600f4d.\n\nReason for revert: mainline team is asking to cut builds. I will postpone rolling this change to users.\n\nChange-Id: Id8ed8e88561af2e002ae46aecabf5f21e1335aaa\n" }, { "commit": "d38f55ab0f5662d7193247eeea8d7dc10c45490b", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "8e6c9d4b6d5047a2e0afa0bf081c57702e932105", "4fa4700591061643a7ee71607210ed4a99a5978d" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Aug 12 14:50:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 12 14:50:06 2024 +0000" }, "message": "Add MCC/MNC override for American Samoa. am: 70d9fa487a am: 4fa4700591\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3213828\n\nChange-Id: Ie639a3e651164709d6588380505954e2fa2c80b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4fa4700591061643a7ee71607210ed4a99a5978d", "tree": "041f7dd52ffc8f7f3559372fb0f5442a83a1a286", "parents": [ "2efa902bb234d5f157e161d3aff3042b02ccfdc9", "70d9fa487a84480a0bf41db1ae734fca5a600f4d" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Aug 12 14:30:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 12 14:30:25 2024 +0000" }, "message": "Add MCC/MNC override for American Samoa. am: 70d9fa487a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3213828\n\nChange-Id: I8498a2cb9438e9476b78b0da7722153a34d799e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70d9fa487a84480a0bf41db1ae734fca5a600f4d", "tree": "b26b4d5cf1eafccee7f992d8e95faae2398fb6e5", "parents": [ "6c9ef37561687114e637afb0bb4083fa710d3be8" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Aug 12 11:16:33 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Aug 12 11:16:33 2024 +0100" }, "message": "Add MCC/MNC override for American Samoa.\n\nMCC:MNC 311:780 is actually used in American Samoa.\n\nBug: 328151581\nBug: b/328151581#comment20\n\nTest: presubmit\nChange-Id: Iad639d01050a774601f0f78345439f9fc7f45f87\n" }, { "commit": "8e6c9d4b6d5047a2e0afa0bf081c57702e932105", "tree": "be0429f84b0210ffd8b5aeaf56527debb61dd86f", "parents": [ "5cac886f669b45d54ad313fcea6bb9a32c442ba3", "2efa902bb234d5f157e161d3aff3042b02ccfdc9" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 21 20:23:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 21 20:23:04 2024 +0000" }, "message": "Rename icu_tzdata.dat_host target. am: 6c9ef37561 am: 2efa902bb2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3142716\n\nChange-Id: Iab0899dc4e31aba0b0c4b9c39b81c02d09c63596\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2efa902bb234d5f157e161d3aff3042b02ccfdc9", "tree": "be0429f84b0210ffd8b5aeaf56527debb61dd86f", "parents": [ "27f22c192e7b29fe47ebb44995234c4e2dd74760", "6c9ef37561687114e637afb0bb4083fa710d3be8" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 21 20:05:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 21 20:05:24 2024 +0000" }, "message": "Rename icu_tzdata.dat_host target. am: 6c9ef37561\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3142716\n\nChange-Id: Ief5d7223176418d376b4f413112b84f4a659442d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c9ef37561687114e637afb0bb4083fa710d3be8", "tree": "142fd0189778f465301b8028ac766d2e8a4fa1ac", "parents": [ "0bb9be84cc2b8fb8b2f57235255d9e10e16810bc" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 21 13:27:24 2024 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 21 13:27:24 2024 +0000" }, "message": "Rename icu_tzdata.dat_host target.\n\nicu_tzdata.dat was replaced by .res files.\n\nBug: 347657693\nTest: ./art/tools/run-libcore-tests.sh --mode host\nChange-Id: Ic6e0d65e897d25ae496fea7a7965d4b13d6a9347\n" }, { "commit": "5cac886f669b45d54ad313fcea6bb9a32c442ba3", "tree": "164bbb2930acfe5ae8853672e291fc3da80971ad", "parents": [ "6950aa854c2a6f67a549426f6702e7e8b4d7d3e5", "27f22c192e7b29fe47ebb44995234c4e2dd74760" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 20:58:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 20:58:05 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 27f22c192e -s ours\n\nam skip reason: Merged-In I07432e1683b38a0d29df1e62c71380646963314e with SHA-1 567f2419c4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/27909168\n\nChange-Id: I749c4c08cf4a00e7ee6738ea18d5b68e11ddea72\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "27f22c192e7b29fe47ebb44995234c4e2dd74760", "tree": "164bbb2930acfe5ae8853672e291fc3da80971ad", "parents": [ "d75c90d0fd67520f8432fb8360df303b5e6bd615", "b12190c8b34cb0c200d9f94f7c33fc8b475bd2f5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:53 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:53 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I07432e1683b38a0d29df1e62c71380646963314e\nChange-Id: I68413bda337f529ca82945ac438f58cbede0ecf6\n" }, { "commit": "6950aa854c2a6f67a549426f6702e7e8b4d7d3e5", "tree": "164bbb2930acfe5ae8853672e291fc3da80971ad", "parents": [ "b12190c8b34cb0c200d9f94f7c33fc8b475bd2f5", "d75c90d0fd67520f8432fb8360df303b5e6bd615" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 17 13:06:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 13:06:17 2024 +0000" }, "message": "Remove unused build targets. am: 0bb9be84cc am: d75c90d0fd\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3131764\n\nChange-Id: Ib6f1eb19dc15b3c5da07134044820ed255d20892\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d75c90d0fd67520f8432fb8360df303b5e6bd615", "tree": "e29f6b9c90496ebcdfa136e367a8d043affe6df8", "parents": [ "66af037e7f6c6b630a55d25fdfe748d939c1d669", "0bb9be84cc2b8fb8b2f57235255d9e10e16810bc" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 17 12:58:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 12:58:15 2024 +0000" }, "message": "Remove unused build targets. am: 0bb9be84cc\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3131764\n\nChange-Id: I0a8ac95ddde0616e90fd0c442c8688295262f0dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0bb9be84cc2b8fb8b2f57235255d9e10e16810bc", "tree": "e29f6b9c90496ebcdfa136e367a8d043affe6df8", "parents": [ "75100975bc318ed5291b1437e0e5a2ea9d0a73bf" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 17 12:47:11 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 17 12:50:22 2024 +0000" }, "message": "Remove unused build targets.\n\nShould be safe according to b/129332183#comment35.\n\nBug: 347657693\nTest: ./art/tools/run-libcore-tests.sh --mode host\nTest: CtsIcuTestCases\nChange-Id: I32fde8b9041ce5cb37d443d44305c9616d97be13\n" }, { "commit": "b12190c8b34cb0c200d9f94f7c33fc8b475bd2f5", "tree": "3033200f31a47b4f1b4ff8d68451d1fd7e1ec175", "parents": [ "c5551a37da1e7537963f26981b9a5d5d9a951ef0", "66af037e7f6c6b630a55d25fdfe748d939c1d669" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 14 16:44:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 14 16:44:33 2024 +0000" }, "message": "Update install paths of host targets. am: 75100975bc am: 66af037e7f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3133494\n\nChange-Id: Id4aff1d8ce9b4fa32613230e22fd6ba125118df9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "66af037e7f6c6b630a55d25fdfe748d939c1d669", "tree": "ae07ecc16c61fd880bbfcf70df863c40badde7ad", "parents": [ "b06b0d8f29d22337d3f8cc52708763d724a96435", "75100975bc318ed5291b1437e0e5a2ea9d0a73bf" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 14 16:29:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 14 16:29:13 2024 +0000" }, "message": "Update install paths of host targets. am: 75100975bc\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3133494\n\nChange-Id: I1fdd541278447b5a16589c87d8cede82c88248ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75100975bc318ed5291b1437e0e5a2ea9d0a73bf", "tree": "ae07ecc16c61fd880bbfcf70df863c40badde7ad", "parents": [ "b06b0d8f29d22337d3f8cc52708763d724a96435" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 14 09:52:51 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 14 16:04:49 2024 +0100" }, "message": "Update install paths of host targets.\n\nThey were missed when versioned paths were introduced and only\nafter aosp/3117455 it became visible.\n\nBug: 319103072\nTest: art/test.py -b --host -r -t 595-profile-saving\nChange-Id: I05dae2b9439aadd11cfc6f5124a80a29e9722189\n" }, { "commit": "c5551a37da1e7537963f26981b9a5d5d9a951ef0", "tree": "56d57899cc98801dd11fad9b871df63f8aa8365e", "parents": [ "6f745a0de15347c6a36cc960d4fa0679f3a66566", "b06b0d8f29d22337d3f8cc52708763d724a96435" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 12 14:07:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 12 14:07:45 2024 +0000" }, "message": "Remove no longer used files. am: 1554a08667 am: b06b0d8f29\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3119871\n\nChange-Id: Iba3d67c8c2fe0f1c8584cdc95863efcdc0bf3a9c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b06b0d8f29d22337d3f8cc52708763d724a96435", "tree": "6747b256c95c82b7e59d28f914db9ad8099361da", "parents": [ "c794c51dd3beca7d66eb14b4579e6bbc0b5a48be", "1554a0866756734dcbd2b781d07e74e1f155c5e4" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 12 13:52:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 12 13:52:47 2024 +0000" }, "message": "Remove no longer used files. am: 1554a08667\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3119871\n\nChange-Id: I4b393e2146eab3daf4d53746dee5af074a93b432\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1554a0866756734dcbd2b781d07e74e1f155c5e4", "tree": "6747b256c95c82b7e59d28f914db9ad8099361da", "parents": [ "791e5ec3ffd1259a75fb0e4a3ac8a89bfb2f1b8b" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 07 13:22:38 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Jun 07 13:22:38 2024 +0100" }, "message": "Remove no longer used files.\n\nThese files are be read from versioned path now.\n\nBug: 319103072\nTest: CtsLibcoreTestCases\nTest: time zone picker works\nChange-Id: Ic19de9c13644b8e56aead2db1235b2909317f259\n" }, { "commit": "6f745a0de15347c6a36cc960d4fa0679f3a66566", "tree": "a1a7fed45f9b2b82395fa1a59658e7b4797375f8", "parents": [ "4b5503cd95060b5086faf4a06284e0a9e8494272", "c794c51dd3beca7d66eb14b4579e6bbc0b5a48be" ], "author": { "name": "kellyhung", "email": "kellyhung@google.com", "time": "Fri Jun 07 09:07:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 07 09:07:58 2024 +0000" }, "message": "Convert Android.mk for system/timezone to Android.bp am: 791e5ec3ff am: c794c51dd3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3116128\n\nChange-Id: Ibf53556e6757e906b6421387a84031dda09c36a8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c794c51dd3beca7d66eb14b4579e6bbc0b5a48be", "tree": "94f36bd74beacb7e6312d9be05d994904675527a", "parents": [ "ac7af087983dc19d9350e8d243f31ab92bba8141", "791e5ec3ffd1259a75fb0e4a3ac8a89bfb2f1b8b" ], "author": { "name": "kellyhung", "email": "kellyhung@google.com", "time": "Fri Jun 07 08:51:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 07 08:51:32 2024 +0000" }, "message": "Convert Android.mk for system/timezone to Android.bp am: 791e5ec3ff\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3116128\n\nChange-Id: Id3f377e04578b979c0b9f9dab7b61958021f1afe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "791e5ec3ffd1259a75fb0e4a3ac8a89bfb2f1b8b", "tree": "94f36bd74beacb7e6312d9be05d994904675527a", "parents": [ "2f8c293fdcd59e685c4165343251d821469de764" ], "author": { "name": "kellyhung", "email": "kellyhung@google.com", "time": "Thu Jun 06 09:35:50 2024 +0000" }, "committer": { "name": "kellyhung", "email": "kellyhung@google.com", "time": "Thu Jun 06 15:55:42 2024 +0000" }, "message": "Convert Android.mk for system/timezone to Android.bp\n\nBug: 344797372\n\nTest: m tzdata_host_tzdata_apex\nTest: m tz_version_host_tzdata_apex\nTest: m tzlookup.xml_host_tzdata_apex\nTest: m telephonylookup.xml_host_tzdata_apex\nTest: m icu_tzdata.dat_host_tzdata_apex\nTest: m icu_timezoneTypes.res_host_tzdata_apex\nTest: m icu_windowsZones.res_host_tzdata_apex\nTest: m icu_zoneinfo64.res_host_tzdata_apex\nChange-Id: Iebb5f363ff808f980ac57f7e900e86acbc9321f7\n" }, { "commit": "4b5503cd95060b5086faf4a06284e0a9e8494272", "tree": "daf25581bbfd8f86f84f7b02e571616a11d89ef1", "parents": [ "81f005ca35778e12e44b715ba25f3c0487d7d2be", "ac7af087983dc19d9350e8d243f31ab92bba8141" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 06 02:41:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 06 02:41:28 2024 +0000" }, "message": "Merge \"Remove WITH_HOST_DALVIK check in Android.mk\" into main am: 2f8c293fdc am: ac7af08798\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3115564\n\nChange-Id: Ibdeb370a17a723d1c8b1f96b3e966778e85c3d69\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac7af087983dc19d9350e8d243f31ab92bba8141", "tree": "771905620f50a591bcdaa73bfefaf0522eb2cc37", "parents": [ "2c6509fd5bb92c6d0ea466b48b0403ccc3becd80", "2f8c293fdcd59e685c4165343251d821469de764" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 06 02:26:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 06 02:26:09 2024 +0000" }, "message": "Merge \"Remove WITH_HOST_DALVIK check in Android.mk\" into main am: 2f8c293fdc\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3115564\n\nChange-Id: Id935cb15d2a3b2ed95abe661888ef3b145ad149e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2f8c293fdcd59e685c4165343251d821469de764", "tree": "771905620f50a591bcdaa73bfefaf0522eb2cc37", "parents": [ "37c2ea97afa476fd363f8e16ec86c7a4b12f92e6", "ff7fdc766b7517e419c38fe5f3d3c264128fef66" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jun 06 01:59:32 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 06 01:59:32 2024 +0000" }, "message": "Merge \"Remove WITH_HOST_DALVIK check in Android.mk\" into main" }, { "commit": "81f005ca35778e12e44b715ba25f3c0487d7d2be", "tree": "381de2d4229ad99ce5bac247ffe0481fc852d513", "parents": [ "902452f117c8004f14c5353c8a64b0216ee9c391", "2c6509fd5bb92c6d0ea466b48b0403ccc3becd80" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 05 18:15:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 05 18:15:36 2024 +0000" }, "message": "Revert^4 \"Introduce versioned data files to tzdata module.\" am: 37c2ea97af am: 2c6509fd5b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3115985\n\nChange-Id: I21d66e68ac1020f57062a99c5afd688b75f09a2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2c6509fd5bb92c6d0ea466b48b0403ccc3becd80", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "a829099ef0becab012afc98dca32d5fbc11b27b8", "37c2ea97afa476fd363f8e16ec86c7a4b12f92e6" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 05 17:57:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 05 17:57:18 2024 +0000" }, "message": "Revert^4 \"Introduce versioned data files to tzdata module.\" am: 37c2ea97af\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3115985\n\nChange-Id: Icc389ec467acbf04c75a4d4a31ce010cdd9987d5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ff7fdc766b7517e419c38fe5f3d3c264128fef66", "tree": "4987d7abb9e3e519f24249cc62fcded3ff6e3a91", "parents": [ "a8067db9d98c226a9b49aa261c2c6f7cda82c9ab" ], "author": { "name": "kellyhung", "email": "kellyhung@google.com", "time": "Wed Jun 05 03:53:49 2024 +0000" }, "committer": { "name": "Kelly Hung", "email": "kellyhung@google.com", "time": "Wed Jun 05 14:25:35 2024 +0000" }, "message": "Remove WITH_HOST_DALVIK check in Android.mk\n\nUpon confirmation, WITH_HOST_DALVIK is always set to true in build/make/core/product_config.mk, which is ultimately included by build/make/core/main.mk.\nTherefore, its value is always true. We can directly remove the check for WITH_HOST_DALVIK.\n\nBug: 344797372\nTest: m tzdata_host_tzdata_apex\nTest: m tz_version_host_tzdata_apex\nTest: m tzlookup.xml_host_tzdata_apex\nTest: m telephonylookup.xml_host_tzdata_apex\nTest: m icu_tzdata.dat_host_tzdata_apex\nTest: m icu_timezoneTypes.res_host_tzdata_apex\nTest: m icu_windowsZones.res_host_tzdata_apex\nTest: m icu_zoneinfo64.res_host_tzdata_apex\nChange-Id: Ibb0ca4d9c3fa9f0b09aec46dfe9776ad8f736772\n" }, { "commit": "37c2ea97afa476fd363f8e16ec86c7a4b12f92e6", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "a8067db9d98c226a9b49aa261c2c6f7cda82c9ab" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 05 09:13:02 2024 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Jun 05 11:10:05 2024 +0000" }, "message": "Revert^4 \"Introduce versioned data files to tzdata module.\"\n\nReverts aosp/3112090.\n\nNO_IFTTT\u003dIntroducing linter checks.\n\nBug: 319103072\n\nTest: CtsIcuTestCases\nTest: CtsLibcoreTestCases\nTest: CtsLibcoreOjTestCases\nTest: CtsIcu4cTestCases\nTest: CtsBionicTestCases\nTest: CtsTextTestCases\nTest: MtsTimeZoneDataTestCases\nChange-Id: I8619c71b882dce19c3c4d14b9b5981d9df432bdf\n" }, { "commit": "902452f117c8004f14c5353c8a64b0216ee9c391", "tree": "0ebcfb2c1045446e62e1e041614fc8694f740c5c", "parents": [ "f10a48b0ca764de1fa9b5c29d2cd705cd5ba4fcd", "a829099ef0becab012afc98dca32d5fbc11b27b8" ], "author": { "name": "Priyanka Advani", "email": "padvani@google.com", "time": "Tue Jun 04 19:13:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 04 19:13:52 2024 +0000" }, "message": "Revert^3 \"Introduce versioned data files to tzdata module.\" am: a8067db9d9 am: a829099ef0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3112090\n\nChange-Id: I2c761a9d892a2454f4f19eb20b238431a6729c14\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a829099ef0becab012afc98dca32d5fbc11b27b8", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "10d2c009618705c2896bac2842379c90217ab9d2", "a8067db9d98c226a9b49aa261c2c6f7cda82c9ab" ], "author": { "name": "Priyanka Advani", "email": "padvani@google.com", "time": "Tue Jun 04 18:58:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 04 18:58:38 2024 +0000" }, "message": "Revert^3 \"Introduce versioned data files to tzdata module.\" am: a8067db9d9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3112090\n\nChange-Id: Ic833c4bb6ee6570906b7d10b7a85c5d2e1c10a26\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a8067db9d98c226a9b49aa261c2c6f7cda82c9ab", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "a3d5ddd52e638d15af244b8dc20e3137aa8eec01" ], "author": { "name": "Priyanka Advani", "email": "padvani@google.com", "time": "Tue Jun 04 18:35:34 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 04 18:35:35 2024 +0000" }, "message": "Revert^3 \"Introduce versioned data files to tzdata module.\"\n\na3d5ddd52e638d15af244b8dc20e3137aa8eec01\n\nChange-Id: I25de2346b47b22c3e07a31a856adbb7dc1d77f69\n" }, { "commit": "f10a48b0ca764de1fa9b5c29d2cd705cd5ba4fcd", "tree": "381de2d4229ad99ce5bac247ffe0481fc852d513", "parents": [ "5e853995af3b5a4ef361935dfc5831818dd07c82", "10d2c009618705c2896bac2842379c90217ab9d2" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Jun 04 16:34:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 04 16:34:54 2024 +0000" }, "message": "Revert^2 \"Introduce versioned data files to tzdata module.\" am: a3d5ddd52e am: 10d2c00961\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3111781\n\nChange-Id: I65534b58cbd278f29a6cfd934d20c69cf36dd6dc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10d2c009618705c2896bac2842379c90217ab9d2", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "deaceb023f6941577f034cfc5e9491c2cbd224ae", "a3d5ddd52e638d15af244b8dc20e3137aa8eec01" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Jun 04 16:15:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 04 16:15:23 2024 +0000" }, "message": "Revert^2 \"Introduce versioned data files to tzdata module.\" am: a3d5ddd52e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3111781\n\nChange-Id: I14984fb3b479ca004f5625c327c970805d90b2a6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a3d5ddd52e638d15af244b8dc20e3137aa8eec01", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "f2cfb13bd33f7e66227ddf826c00f83f48aed968" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Jun 04 08:24:56 2024 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue Jun 04 11:12:25 2024 +0000" }, "message": "Revert^2 \"Introduce versioned data files to tzdata module.\"\n\nReverted changes: aosp/3111764\n\nNO_IFTTT\u003dIntroducing linter checks.\n\nBug: 319103072\n\nTest: CtsIcuTestCases\nTest: CtsLibcoreTestCases\nTest: CtsLibcoreOjTestCases\nTest: CtsIcu4cTestCases\nTest: CtsBionicTestCases\nTest: CtsTextTestCases\nTest: MtsTimeZoneDataTestCases\n\nChange-Id: I88f17a01e93873a6c76ef463b6bb03e8825aebd8\n" }, { "commit": "5e853995af3b5a4ef361935dfc5831818dd07c82", "tree": "0ebcfb2c1045446e62e1e041614fc8694f740c5c", "parents": [ "ec2bea17f74b944fc198cacbf90f1d713ecc5ce9", "deaceb023f6941577f034cfc5e9491c2cbd224ae" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Mon Jun 03 19:49:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 03 19:49:51 2024 +0000" }, "message": "Revert \"Introduce versioned data files to tzdata module.\" am: f2cfb13bd3 am: deaceb023f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3111764\n\nChange-Id: If99280bb4e5728e91ea1502ad1d52039c7587552\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "deaceb023f6941577f034cfc5e9491c2cbd224ae", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "514a554f1ca0b9adaa77aea35bfc5df3b8dc7d8d", "f2cfb13bd33f7e66227ddf826c00f83f48aed968" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Mon Jun 03 19:42:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 03 19:42:52 2024 +0000" }, "message": "Revert \"Introduce versioned data files to tzdata module.\" am: f2cfb13bd3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3111764\n\nChange-Id: Ie39b15ad5b5bbf917c0c086ad5cbc52178982c9f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2cfb13bd33f7e66227ddf826c00f83f48aed968", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "f8fbd2c134a21e98c2038767eb212088b17aee7c" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Mon Jun 03 19:18:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 03 19:18:23 2024 +0000" }, "message": "Revert \"Introduce versioned data files to tzdata module.\"\n\nRevert submission 3088648-no-more-tzdatas\n\nReason for revert:DroidMonitor. Potential culprit for b/344614182 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted\n\nReverted changes: /q/submissionid:3088648-no-more-tzdatas\n\nChange-Id: Ic2574d5971c41fdb80c8f01de0069521057f1c0d\n" }, { "commit": "ec2bea17f74b944fc198cacbf90f1d713ecc5ce9", "tree": "381de2d4229ad99ce5bac247ffe0481fc852d513", "parents": [ "567f2419c4823d91162951955a8a606baedab064", "514a554f1ca0b9adaa77aea35bfc5df3b8dc7d8d" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 03 16:36:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 03 16:36:21 2024 +0000" }, "message": "Introduce versioned data files to tzdata module. am: f8fbd2c134 am: 514a554f1c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3088745\n\nChange-Id: Iad1ebb6f37e767fadc4fc740d615e787b81677f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "514a554f1ca0b9adaa77aea35bfc5df3b8dc7d8d", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "9318b62b30168559e5d47bbe6766f77835f53816", "f8fbd2c134a21e98c2038767eb212088b17aee7c" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 03 16:29:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 03 16:29:34 2024 +0000" }, "message": "Introduce versioned data files to tzdata module. am: f8fbd2c134\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3088745\n\nChange-Id: Iab9b33f9a04d6bbb62148a18c040e0d806226fa0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8fbd2c134a21e98c2038767eb212088b17aee7c", "tree": "ad0643170f2960f2619b20ce4fc1489b336507a4", "parents": [ "271f259489d4156eccc7e7d508e67ae10dfcdce2" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed May 15 12:13:49 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Jun 03 13:29:56 2024 +0100" }, "message": "Introduce versioned data files to tzdata module.\n\nWe are changing tzdata module to be suitable for multiple Android\nreleases.\n\nBug: 319103072\n\nTest: CtsIcuTestCases\nTest: CtsLibcoreTestCases\nTest: CtsLibcoreOjTestCases\nTest: CtsIcu4cTestCases\nTest: CtsBionicTestCases\nTest: CtsTextTestCases\nTest: MtsTimeZoneDataTestCases\nChange-Id: I6e55c64efa0cace7463896e117bc766dc32ffdfb\n" }, { "commit": "567f2419c4823d91162951955a8a606baedab064", "tree": "0ebcfb2c1045446e62e1e041614fc8694f740c5c", "parents": [ "a2ad41a5c61d30a43d8c0eb0f4f41d408ca1b1c0" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue May 28 10:00:21 2024 +0100" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Tue May 28 14:35:28 2024 +0100" }, "message": "Add if-branch for API level 35 to TimeZoneVersionTest.\n\nV\u0027s major version is 008 and ICU version there is 75.\n\nBug: 342951923\nBug: 342662015\n\nTest: presubmit\nTest: MtsTimeZoneDataTestCases\n\nChange-Id: I07432e1683b38a0d29df1e62c71380646963314e\n" }, { "commit": "a2ad41a5c61d30a43d8c0eb0f4f41d408ca1b1c0", "tree": "d19a6c3d493ebcd93e881d7674a81f29de6ef707", "parents": [ "292150fdd933a9e8ff7676662d0464bc34a58809", "9318b62b30168559e5d47bbe6766f77835f53816" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Tue May 07 14:28:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 07 14:28:41 2024 +0000" }, "message": "Use time zone .res file directly am: 271f259489 am: 9318b62b30\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/2723506\n\nChange-Id: I8ce1067d39b2f0e73ec4fb7dc3da07dc44937ce3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9318b62b30168559e5d47bbe6766f77835f53816", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "15a3db64ddf822b21c79436ef90da1f135ab921c", "271f259489d4156eccc7e7d508e67ae10dfcdce2" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Tue May 07 14:09:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 07 14:09:12 2024 +0000" }, "message": "Use time zone .res file directly am: 271f259489\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/2723506\n\nChange-Id: Ie086d3d500273ec5ccc03ef828384ba8f7f0973f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "271f259489d4156eccc7e7d508e67ae10dfcdce2", "tree": "a50e700c2d3920ff20d5e00e8442620cb24a5ea7", "parents": [ "ebc77019b5de121cedeb58f3c1c0e180a43aef55" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Thu Aug 24 10:14:13 2023 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu May 02 14:31:03 2024 +0000" }, "message": "Use time zone .res file directly\n\n.dat is specific to and needs to be re-generated for every ICU major\nversion, while .res files are not. Using .res files are documented and\nsupported by the upstream since ICU 54.\n\nDocs might still mention .dat, they will be cleaned in the future CLs.\n\nBug: 298349312\nBug: 319103072\nTest: no such file adb shell ls /apex/com.android.tzdata/etc/icu/*.dat\nTest: icupkg -l external/icu/icu4c/source/stubdata/icudt72l.dat | grep zoneinfo\nTest: adb shell ls /apex/com.android.tzdata/etc/icu/*.data prints nothing\nTest: out/host/linux-x86/com.android.tzdata/etc/icu has no *.dat file\nChange-Id: I2b2e5bb12a6267dc5afeee2e1a82d8c1e113e977\n" }, { "commit": "292150fdd933a9e8ff7676662d0464bc34a58809", "tree": "4d3530abc44707323f8c5c69a2eed8215166ddfb", "parents": [ "f8b9f4c2dadefbcbdfd96e67da43a6a4af59dcbf", "15a3db64ddf822b21c79436ef90da1f135ab921c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Apr 30 02:10:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 30 02:10:30 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 15a3db64dd -s ours\n\nam skip reason: Merged-In Ib64cec3ed2d40559923abb0d2727c3f5a8ee7185 with SHA-1 cf7e54bb70 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/27145061\n\nChange-Id: I794f2cbf11243ed7f9813d06eac96d77a46a0b88\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "15a3db64ddf822b21c79436ef90da1f135ab921c", "tree": "68e300eaa35c6fad9f505b2f08fdcc0913e0b5b8", "parents": [ "9ace629626793b17e027a29960a0d5f4f8511924", "3d93a6e706dd2dfd0a21baa36e6d3be5c263fbc1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:53:37 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:53:37 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Ib64cec3ed2d40559923abb0d2727c3f5a8ee7185\nChange-Id: I4bad2769cf02831b7e109a3740ab601a80788c1a\n" }, { "commit": "f8b9f4c2dadefbcbdfd96e67da43a6a4af59dcbf", "tree": "4d3530abc44707323f8c5c69a2eed8215166ddfb", "parents": [ "1346c3ee2e4df1a7cfd7999ea488121bc5aced94", "9ace629626793b17e027a29960a0d5f4f8511924" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Mon Apr 22 10:17:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 10:17:44 2024 +0000" }, "message": "Regenerate data files for ICU 75 upgrade am: ebc77019b5 am: 9ace629626\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3048625\n\nChange-Id: I9eb1d1da3c6f8ba77bcde14241bd787fca6e4c8e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9ace629626793b17e027a29960a0d5f4f8511924", "tree": "68e300eaa35c6fad9f505b2f08fdcc0913e0b5b8", "parents": [ "34ce6446d112d43683e9f5c19d541ca93fed6847", "ebc77019b5de121cedeb58f3c1c0e180a43aef55" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Mon Apr 22 09:57:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 09:57:58 2024 +0000" }, "message": "Regenerate data files for ICU 75 upgrade am: ebc77019b5\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3048625\n\nChange-Id: I40ba2941dc2a24a548d4df8a8689b4d2b1e68b5a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebc77019b5de121cedeb58f3c1c0e180a43aef55", "tree": "68e300eaa35c6fad9f505b2f08fdcc0913e0b5b8", "parents": [ "f98d570a11405d2dd59238626e582317ebf45bd3" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Apr 19 12:58:19 2024 +0100" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Apr 19 12:58:19 2024 +0100" }, "message": "Regenerate data files for ICU 75 upgrade\n\nBinary data files updated using:\nsystem/timezone/update-tzdata.py\n\nThis updates the ICU version number inside of icu_tzdata.dat but doesn\u0027t\nchange the timezone data itself.\n\nBug: 320769332\nTest: n/a\nChange-Id: If7db6086c3713cb13797fad18a154e53934c6af8\n" }, { "commit": "1346c3ee2e4df1a7cfd7999ea488121bc5aced94", "tree": "cf231278e07830c1718009bbf08e94977aa37433", "parents": [ "f186d2a1b334b989fe9371c4552d8743a41e9760", "34ce6446d112d43683e9f5c19d541ca93fed6847" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Thu Apr 04 18:25:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 04 18:25:44 2024 +0000" }, "message": "Use Unicode v3 am: f98d570a11 am: 34ce6446d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3014214\n\nChange-Id: I2bc9e43ff5dbcd787b614b22137f71f1aa1d2bea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "34ce6446d112d43683e9f5c19d541ca93fed6847", "tree": "04bbe633fdb26134f0a7172dac8a341a2beb2da3", "parents": [ "0e23a985216147201944fe4af2a03f6d30ebb46a", "f98d570a11405d2dd59238626e582317ebf45bd3" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Thu Apr 04 18:14:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 04 18:14:04 2024 +0000" }, "message": "Use Unicode v3 am: f98d570a11\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3014214\n\nChange-Id: I7b0cb7f40c042be9cee30996291a8e7677fc7a52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f98d570a11405d2dd59238626e582317ebf45bd3", "tree": "04bbe633fdb26134f0a7172dac8a341a2beb2da3", "parents": [ "3fca90950175838fa780519dd25c0dae0e5b0278" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Tue Mar 26 15:58:23 2024 +0000" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Wed Apr 03 15:56:16 2024 +0100" }, "message": "Use Unicode v3\n\nIt\u0027s the same license used by ICU 74\n\nBug: 327164201\nTest: tools/updatetzdata.py\nChange-Id: I89803e9742e68cf40185b5d81a814e3f13cef585\n" }, { "commit": "f186d2a1b334b989fe9371c4552d8743a41e9760", "tree": "3e0cf0e8d8e5cd4dd64ae11196ee7e744f6042ca", "parents": [ "ccb7b567ecc30c6b5ce4ef99752dd6d112187aa8", "0e23a985216147201944fe4af2a03f6d30ebb46a" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Mon Mar 25 10:39:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 25 10:39:28 2024 +0000" }, "message": "Regenerate data files for ICU 74 upgrade am: 3fca909501 am: 0e23a98521\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3004056\n\nChange-Id: I3773bb6c76bacf520e00061e5f5bba93a2c2ec65\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e23a985216147201944fe4af2a03f6d30ebb46a", "tree": "0b66a9823585cd514cf604123ff8c4e68b4ed6f4", "parents": [ "1c32dbef433ab7ad7032d08a5df9fe8b21345489", "3fca90950175838fa780519dd25c0dae0e5b0278" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Mon Mar 25 10:23:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 25 10:23:13 2024 +0000" }, "message": "Regenerate data files for ICU 74 upgrade am: 3fca909501\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/timezone/+/3004056\n\nChange-Id: I0211e7ec13f252745032ad285bbd5bb685e10e09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3fca90950175838fa780519dd25c0dae0e5b0278", "tree": "0b66a9823585cd514cf604123ff8c4e68b4ed6f4", "parents": [ "1c32dbef433ab7ad7032d08a5df9fe8b21345489" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Mar 08 17:22:49 2024 +0000" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Thu Mar 21 12:03:41 2024 +0000" }, "message": "Regenerate data files for ICU 74 upgrade\n\nBinary data files updated using:\nsystem/timezone/update-tzdata.py\n\nThis updates the ICU version number inside of icu_tzdata.dat but doesn\u0027t\nchange the timezone data itself.\n\nThe LICENSE file change is manually reverted as it was changed by\nupdate-tzdata.py. We will fix update-tzdata.py in the future.\n\nBug: 327164201\nTest: n/a\nChange-Id: I9ef450e20dbaee2168730711fe1ba8380df052d9\n" }, { "commit": "ccb7b567ecc30c6b5ce4ef99752dd6d112187aa8", "tree": "550c909ec68bb0a36948eb583f19e3fbcdea145f", "parents": [ "3d93a6e706dd2dfd0a21baa36e6d3be5c263fbc1" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Mon Dec 11 13:44:51 2023 +0000" }, "committer": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Wed Mar 06 15:06:16 2024 +0000" }, "message": "Reference tzdata6 for V devices.\n\ntzdata5 is being renamed to tzdata6. This is normal for Android\nreleases where the contents of the com.android.tzdata module has\nchanged and has become incompatible with previous releases.\n\nBug: 314723518\nTest: atest com.android.tests.apex.TimezoneDataHostTest\nTest: atest MtsTimeZoneDataTestCases\nChange-Id: I20472816fd0fec790ed2887e78433e53f934f6b6\n" }, { "commit": "3d93a6e706dd2dfd0a21baa36e6d3be5c263fbc1", "tree": "e170c46911df1a93406b48020b75e559657568be", "parents": [ "d7298997377ce47e536491c54be08040f69307f5", "0df8858d1005acfe6270b3f75aa1f044e52edab8" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Feb 23 00:01:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 23 00:01:17 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: b7cbdd1122 -s ours am: ac69eac3f6 -s ours am: b6a1b28ce9 -s ours am: 063c89bb5b -s ours am: 0df8858d10 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: I2062352f93ad3f37d529a3b0007cbabe40f64297\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d7298997377ce47e536491c54be08040f69307f5", "tree": "e170c46911df1a93406b48020b75e559657568be", "parents": [ "6a8884561d2af22cd0a27aa667b55b909ba53fa5", "de60cf5957ae33dcb8b684c2a55074467e620c9e" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Fri Feb 23 00:00:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 23 00:00:52 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: 7054d3a7db -s ours am: 577d513f71 -s ours am: 8c461d626b -s ours am: de60cf5957 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: I8e20d644985080a4250ac3c1f96f0e2d910a4735\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0df8858d1005acfe6270b3f75aa1f044e52edab8", "tree": "2cc4a72b1fad89be5e7ae3f8915e1c13e8a367b5", "parents": [ "de60cf5957ae33dcb8b684c2a55074467e620c9e", "063c89bb5b3ada7229045fd36c332fff140ad11c" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 22 23:15:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 23:15:15 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: b7cbdd1122 -s ours am: ac69eac3f6 -s ours am: b6a1b28ce9 -s ours am: 063c89bb5b -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: I8a9b59b817f1781f204847a7a5565bd3959d8dfd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a8884561d2af22cd0a27aa667b55b909ba53fa5", "tree": "e170c46911df1a93406b48020b75e559657568be", "parents": [ "2619345ffdef18ffe2c47f258ded431511184735", "31e3c7480433285bf040b80c7af7a6b42cc2b20e" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 22 23:14:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 23:14:58 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: b7cbdd1122 -s ours am: ac69eac3f6 -s ours am: b6a1b28ce9 -s ours am: 31e3c74804 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: Ibf13f23e69b6892531a37c0fb34fe4774042a020\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "de60cf5957ae33dcb8b684c2a55074467e620c9e", "tree": "2cc4a72b1fad89be5e7ae3f8915e1c13e8a367b5", "parents": [ "c0b486e5f715db6e76ab6259b847e5507eaf8c62", "8c461d626bb166163dcf2a776d45cc9eb635fe0c" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 22 23:14:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 23:14:56 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: 7054d3a7db -s ours am: 577d513f71 -s ours am: 8c461d626b -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: I6a2cb8f3582d149b7e1a8ab4b04411b451394a9f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2619345ffdef18ffe2c47f258ded431511184735", "tree": "e170c46911df1a93406b48020b75e559657568be", "parents": [ "b4cd91c214aa29e94ea8627794044787c827dd3c", "c2234cb580366c777a9a08dedefe506f3ce22279" ], "author": { "name": "Almaz Mingaleev", "email": "mingaleev@google.com", "time": "Thu Feb 22 23:14:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 23:14:32 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE Set targetSdkLevel to 32 for tzdata3 [S] am: cf7e54bb70 -s ours am: efc2fe6975 -s ours am: 7054d3a7db -s ours am: 577d513f71 -s ours am: c2234cb580 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/26334523\n\nChange-Id: I4685831f58ef334ec5f656d510a5c7ae51866584\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "31e3c7480433285bf040b80c7af7a6b42cc2b20e" }