)]}' { "log": [ { "commit": "c8c73fda6b1f3a14baa910e14e8e83246f6e22b1", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "858182199f19c485a42ecaeaae2823995b49fa0e", "0aaa6f70d0394306a579c52c2ec7c6ebb8ad28dd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:45 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:45 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: Icc746086a906db4ea9e546dc0a670b58247981bb\nChange-Id: I5a65789a4085e199e16378bc0b5dd5031fa14456\n" }, { "commit": "858182199f19c485a42ecaeaae2823995b49fa0e", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "19012af4284a6376c4697a2d7b756c59f3781671", "f4edf9f85b10cb8c537d809d85902b68be794619" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 19:30:40 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 19:30:40 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: f4edf9f85b -s ours\n\nam skip reason: Merged-In I08b33fe777338651060ddab94654172682cf2582 with SHA-1 9a0e4d922d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3412880\n\nChange-Id: I23cfee6a6299673c8b978b00622e961946fd473b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f4edf9f85b10cb8c537d809d85902b68be794619", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "21215b087effc9b90c265962df8e53206b7407bf", "19012af4284a6376c4697a2d7b756c59f3781671" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I08b33fe777338651060ddab94654172682cf2582\nChange-Id: I5dc9a0b7b76c861fdab28e8a02e0274d4aad76fa\n" }, { "commit": "0aaa6f70d0394306a579c52c2ec7c6ebb8ad28dd", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "7bfa9abf3bed651ba93f8b21ca89dd6cc539398d", "19012af4284a6376c4697a2d7b756c59f3781671" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 23:15:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 23:15:58 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 19012af428 -s ours\n\nam skip reason: Merged-In I08b33fe777338651060ddab94654172682cf2582 with SHA-1 9a0e4d922d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/30285258\n\nChange-Id: I4affc239a8c6b64c22cfaa9daf971ae35a4eb4f0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19012af4284a6376c4697a2d7b756c59f3781671", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "21d3b63cf4ff15142abc377e15cda0928ad1a174", "7bfa9abf3bed651ba93f8b21ca89dd6cc539398d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:35 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:35 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I08b33fe777338651060ddab94654172682cf2582\nChange-Id: Icc412842a4f97d23030b87502c9b6494b9709dc1\n" }, { "commit": "7bfa9abf3bed651ba93f8b21ca89dd6cc539398d", "tree": "68070cdb01bca1201c21a64c06ae77f1ad210b3e", "parents": [ "84f03711921ee13e607415ff78b73a6bd8b09b76", "9a0e4d922d7a3e0bbb9e2cfe262e01555d7f54dc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 20 00:39:00 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 20 00:39:00 2024 +0000" }, "message": "Merge \"Make BlockedNumberProvider emergency number check more robust.\" into main" }, { "commit": "9a0e4d922d7a3e0bbb9e2cfe262e01555d7f54dc", "tree": "ab354befb29da01aac0c8e9d7ca559df0a6e3762", "parents": [ "c2cc84fa95f18e6d850e0acd7ae913e4d677cd69" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Sep 19 22:39:30 2024 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Sep 19 23:16:40 2024 +0000" }, "message": "Make BlockedNumberProvider emergency number check more robust.\n\nFirst, check to ensure TelephonyManager is non-null; it could be null if\nTelephony is not present on the device at all.\n\nSecond, add \"IllegalStateException\" as it could be thrown if the Telephony\nservice is down or has crashed; this is possible for devices such as wifi\nonly watches which may be bridging a call via HFP (though in practice those\nnormally skip call filtering using `EXTRA_SKIP_CALL_FILTERING` since\ncall filtering isn\u0027t needed for bridged HFP calls.\n\nFixes: 368332015\nTest: This will need to be manually tested on the specific watch model\nimpacted.\nTest: Run unit / cts test suite for Telecom.\nFlag: NONE this is a bugfix related to a provider crash.\n\nChange-Id: I08b33fe777338651060ddab94654172682cf2582\n" }, { "commit": "84f03711921ee13e607415ff78b73a6bd8b09b76", "tree": "13e15e0b5da660b35128b734ed4c52fee7ca8732", "parents": [ "e7d492cae7e9d89b8a1e65e18602db68a57a5dd4", "21d3b63cf4ff15142abc377e15cda0928ad1a174" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:59:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:59:37 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 21215b087e -s ours am: 21d3b63cf4 -s ours\n\nam skip reason: Merged-In Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54 with SHA-1 c2fcc6450e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3258238\n\nChange-Id: I2427080d6538a517c5ffbf1d6061d91d097332b1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21d3b63cf4ff15142abc377e15cda0928ad1a174", "tree": "f0d5ab19f38cbc69a50438a9c708bc0f1a357237", "parents": [ "1c71d719da27d0951612abc8871aec0ebbffa7fc", "21215b087effc9b90c265962df8e53206b7407bf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:43:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 01:43:59 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 21215b087e -s ours\n\nam skip reason: Merged-In Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54 with SHA-1 c2fcc6450e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3258238\n\nChange-Id: Ic11901f2d2a7da09fbf9d5f1accc46a0366d7557\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "21215b087effc9b90c265962df8e53206b7407bf", "tree": "f0d5ab19f38cbc69a50438a9c708bc0f1a357237", "parents": [ "965855a4116ec07fac321c313dd18ed139de923c", "1c71d719da27d0951612abc8871aec0ebbffa7fc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54\nChange-Id: If8e99960f35beecd9534d5587afbaa6c70acbf24\n" }, { "commit": "e7d492cae7e9d89b8a1e65e18602db68a57a5dd4", "tree": "13e15e0b5da660b35128b734ed4c52fee7ca8732", "parents": [ "c2cc84fa95f18e6d850e0acd7ae913e4d677cd69", "1c71d719da27d0951612abc8871aec0ebbffa7fc" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 19:18:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 19:18:02 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: 965855a411 am: 1c71d719da\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3250837\n\nChange-Id: I3322e5ee4343816d7718e49f2e852ea7075593d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1c71d719da27d0951612abc8871aec0ebbffa7fc", "tree": "f0d5ab19f38cbc69a50438a9c708bc0f1a357237", "parents": [ "8b62f6b1705854b59ab3e312b91583ae4f7a2ade", "965855a4116ec07fac321c313dd18ed139de923c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:38:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:38:55 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: 965855a411\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3250837\n\nChange-Id: I04b1a70582096f33101c9ca06f44331169411ab7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "965855a4116ec07fac321c313dd18ed139de923c", "tree": "2d2da3546b07af9510af2afa2b57356e661d03e2", "parents": [ "7ea8d06e3c396c9f7f30678eeea15ddc39153af1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:18 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:18 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: Ic0d6f51713074bddca9f18818682ec38032260f0\n" }, { "commit": "c2cc84fa95f18e6d850e0acd7ae913e4d677cd69", "tree": "3f2f7380073753c7251f805bd2bca0f986190b30", "parents": [ "f15bf622e50259fbc1673cf1d7122ea1f7ae9341" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Fri Jul 12 19:32:37 2024 +0000" }, "committer": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Fri Jul 12 19:32:37 2024 +0000" }, "message": "Don\u0027t link framework aconfig libs for platform targets\n\nThe framework links in a select set of aconfig flag libs. Targets that\nuse `platform_apis: true` can and should reuse these flags, rather than\nlinking in a redundant copy that conflicts with the bootclasspath.\n\nBug: 222468116\nTest: m + presubmit\nFlag: EXEMPT refactor\nChange-Id: I985bee98b95d6d4fadf10cb2f9a91862abca8c2e\n" }, { "commit": "f15bf622e50259fbc1673cf1d7122ea1f7ae9341", "tree": "1971ccf83ec196beb1faadf6eb32e254c7445d12", "parents": [ "e64e12bce4a6c691a8f948c5e0269df2a494d36c", "8b62f6b1705854b59ab3e312b91583ae4f7a2ade" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 21:09:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 21:09:09 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 8b62f6b170 -s ours\n\nam skip reason: Merged-In Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54 with SHA-1 c2fcc6450e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/27909239\n\nChange-Id: I7dd052e0e06a02902daaa417198e3bd707e23e63\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b62f6b1705854b59ab3e312b91583ae4f7a2ade", "tree": "1971ccf83ec196beb1faadf6eb32e254c7445d12", "parents": [ "d13eb46143aa2bacf422584467775b19ca92f005", "2a7810e5f39d9758b135e33b2c1d78a32440f5b1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54\nChange-Id: Ia0cff3f3152e55debdde24ee2362119800c31ba8\n" }, { "commit": "e64e12bce4a6c691a8f948c5e0269df2a494d36c", "tree": "1971ccf83ec196beb1faadf6eb32e254c7445d12", "parents": [ "2a7810e5f39d9758b135e33b2c1d78a32440f5b1", "d13eb46143aa2bacf422584467775b19ca92f005" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:56:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:56:06 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 7ea8d06e3c -s ours am: d13eb46143 -s ours\n\nam skip reason: Merged-In Iaf3f3308f387ac28c92692592b67e0ccac72597d with SHA-1 29898a1f33 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3131941\n\nChange-Id: I81553bbd06a9a5062f91486a4b02742ad0657594\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d13eb46143aa2bacf422584467775b19ca92f005", "tree": "a5e6926b205c62cc09b1628badfe7daf025344d6", "parents": [ "29898a1f330aa9b73fa2805b25e85b4a46f62727", "7ea8d06e3c396c9f7f30678eeea15ddc39153af1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:42:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:42:10 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 7ea8d06e3c -s ours\n\nam skip reason: Merged-In Iaf3f3308f387ac28c92692592b67e0ccac72597d with SHA-1 29898a1f33 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/3131941\n\nChange-Id: Id5952283f6904092031852a2043171e417fa7f21\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7ea8d06e3c396c9f7f30678eeea15ddc39153af1", "tree": "a5e6926b205c62cc09b1628badfe7daf025344d6", "parents": [ "19bec7c0f2006e9cae44b1720aa0ce9862e8db7f", "29898a1f330aa9b73fa2805b25e85b4a46f62727" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:40 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:40 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: Iaf3f3308f387ac28c92692592b67e0ccac72597d\nChange-Id: If41abc6f0e009b5a3e51a8e701667e774e0c64aa\n" }, { "commit": "2a7810e5f39d9758b135e33b2c1d78a32440f5b1", "tree": "1971ccf83ec196beb1faadf6eb32e254c7445d12", "parents": [ "c2fcc6450e5abb0f0517f6832677373d19018ab1", "29898a1f330aa9b73fa2805b25e85b4a46f62727" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 29 19:46:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 19:46:11 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 29898a1f33 -s ours\n\nam skip reason: Merged-In I6632cd79949931740dec0ee913efc32a7849644c with SHA-1 b96cfee413 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/27273912\n\nChange-Id: Ibf5ed5acea2092ba03c52ca4f44380f3a0ff3f78\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c2fcc6450e5abb0f0517f6832677373d19018ab1", "tree": "1971ccf83ec196beb1faadf6eb32e254c7445d12", "parents": [ "33040df3ef9fdf63a3ef23734bd0d7c28f7e64cf" ], "author": { "name": "Nikhil Kumar", "email": "nykkumar@google.com", "time": "Wed May 08 15:58:09 2024 +0100" }, "committer": { "name": "Nikhil Kumar", "email": "nykkumar@google.com", "time": "Wed May 15 18:41:40 2024 +0100" }, "message": "Allow MAIN user to access BlockedNumberProvider\n\nIn Android V HSUM mode the MAIN user is going to have Messaging support. Allow MAIN user to access BlockedNumberProvider to query and add numbers in the block list.\n\nBug: 338579331\nTest: manually tested on cheetah_hsum, able to block numbers from Messaging app.\nTest: atest com.android.providers.blockednumber.BlockedNumberProviderTest\n\nFlag: android.multiuser.allow_main_user_to_access_blocked_number_provider\n\nChange-Id: Ieb1f2d6da1508ab7602b453bfa13d603fbd86c54\n" }, { "commit": "29898a1f330aa9b73fa2805b25e85b4a46f62727", "tree": "a5e6926b205c62cc09b1628badfe7daf025344d6", "parents": [ "19bec7c0f2006e9cae44b1720aa0ce9862e8db7f", "8571b986904b496b1f43a6561219b3cdadf2f9ff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:35 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:35 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I6632cd79949931740dec0ee913efc32a7849644c\nChange-Id: Iaf3f3308f387ac28c92692592b67e0ccac72597d\n" }, { "commit": "33040df3ef9fdf63a3ef23734bd0d7c28f7e64cf", "tree": "b2ac413dc14330aedbcd4f69e63628e6b1a71c7a", "parents": [ "eb28fe5c7f69f619bf1ad761dacd64474cd6f1a5", "91bc9471ebd47b3082f674164cc4a7156f11def2" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Fri Apr 26 03:17:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 26 03:17:51 2024 +0000" }, "message": "[automerger skipped] Remove \"restoreAnyVersion\" tag for backup agent. am: 91bc9471eb -s ours\n\nam skip reason: Merged-In Id4ea46f77645c1d7d950ce4a9432b4fa7c259d9a with SHA-1 eb28fe5c7f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/27079550\n\nChange-Id: I5e98ad6826651190c172b1589efca0142510717c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91bc9471ebd47b3082f674164cc4a7156f11def2", "tree": "b2ac413dc14330aedbcd4f69e63628e6b1a71c7a", "parents": [ "8571b986904b496b1f43a6561219b3cdadf2f9ff" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Mon Mar 18 16:30:49 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Apr 24 07:46:16 2024 +0000" }, "message": "Remove \"restoreAnyVersion\" tag for backup agent.\n\nThis was only added to support a V to U downgrade; there is now a platform\nallow-list that will do an opt-in for this SPECIFIC version transition\nonly.\n\nTest: Manifest-only change.\nFixes: 317150223\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eb28fe5c7f69f619bf1ad761dacd64474cd6f1a5)\nMerged-In: Id4ea46f77645c1d7d950ce4a9432b4fa7c259d9a\nChange-Id: Id4ea46f77645c1d7d950ce4a9432b4fa7c259d9a\n" }, { "commit": "eb28fe5c7f69f619bf1ad761dacd64474cd6f1a5", "tree": "b2ac413dc14330aedbcd4f69e63628e6b1a71c7a", "parents": [ "8571b986904b496b1f43a6561219b3cdadf2f9ff" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Mon Mar 18 16:30:49 2024 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Mon Mar 18 16:57:22 2024 +0000" }, "message": "Remove \"restoreAnyVersion\" tag for backup agent.\n\nThis was only added to support a V to U downgrade; there is now a platform\nallow-list that will do an opt-in for this SPECIFIC version transition\nonly.\n\nTest: Manifest-only change.\nFixes: 317150223\nChange-Id: Id4ea46f77645c1d7d950ce4a9432b4fa7c259d9a\n" }, { "commit": "8571b986904b496b1f43a6561219b3cdadf2f9ff", "tree": "a5e6926b205c62cc09b1628badfe7daf025344d6", "parents": [ "c24ac168b0ad14c3f6f4aab897f2ea137b11aed6", "19bec7c0f2006e9cae44b1720aa0ce9862e8db7f" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Tue Feb 13 01:23:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 01:23:42 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: 20220bdddd am: 19bec7c0f2\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2944254\n\nChange-Id: I8cf909fbeb8c2daf461d395a2ee94be57063b4bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19bec7c0f2006e9cae44b1720aa0ce9862e8db7f", "tree": "a49b17ac0410039a49a16cfeacb80e23d1558266", "parents": [ "5701b9b2692ccbe42412910dbe1b9e42c2261925", "20220bdddda3cf5793ac4d78286d56b24f95b8f2" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Tue Feb 13 00:43:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 00:43:17 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: 20220bdddd\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2944254\n\nChange-Id: Ic71436a9df1c60c46b235cd32351dab14f68c06e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c24ac168b0ad14c3f6f4aab897f2ea137b11aed6", "tree": "14f068b0fb6857d7ed96d9838c283d6a5593aed5", "parents": [ "652b841483a07fc510489e2ab995419eb9ce88db", "b96cfee4137be6fc5c79f40a27d014b255e8c8df" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 08 00:38:52 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 08 00:38:52 2024 +0000" }, "message": "Merge \"Make BlockedNumberBackupAgent capable of restoring from newer OS version.\" into main" }, { "commit": "b96cfee4137be6fc5c79f40a27d014b255e8c8df", "tree": "14f068b0fb6857d7ed96d9838c283d6a5593aed5", "parents": [ "3be3e07f9951457e01375f66068f7becf02f0e0d" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Jan 20 00:35:06 2024 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Wed Feb 07 22:16:29 2024 +0000" }, "message": "Make BlockedNumberBackupAgent capable of restoring from newer OS version.\n\nAdding restoreAnyVersion removes the restriction that the OS version must\nbe less than or equal to that of the data being restored. Added a check\nin the onRestore method to check the backup file format version number to\nensure that it is not greater than the current supported version; if it\nis we will skip restoring the data.\n\nThis means that provided the blocked number format has NOT changed,\nyou can restore an SDK X+1 backup file to an SDK X device. This provides\na little bit more flexibility for users to restore from newer devices to\nolder devices and still retain their list of blocked numbers.\n\nFlag: Backup and restore is not flagable; this is also destined for next\nrelease.\nTest: Added unit test to verify that we cannot restore newer backup file\nversions.\nTest: Manual testing was performed to ensure that restoring from newer\nOS to older OS works providing the backup file format didn\u0027t change.\nBug: 317150223317053396\n\nChange-Id: I6632cd79949931740dec0ee913efc32a7849644c\n" }, { "commit": "20220bdddda3cf5793ac4d78286d56b24f95b8f2", "tree": "a49b17ac0410039a49a16cfeacb80e23d1558266", "parents": [ "eed1acc3ba713ce697ab428862f2fdfbb27e20b9" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 14:01:23 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 14:01:23 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model\n\nThis CL is created as a best effort to migrate test targets to the new Android ownership model.\nIt is based on historical data from repository history and insights from git blame.\nGiven the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary\nattribution in this CL, please create a new CL to fix that.\n\nFor detailed guidelines and further information on the migration please refer to the link below,\ngo/new-android-ownership-model\n\nBug: 304529413\nTest: N/A\nChange-Id: I4fa6ba9cb0a65c029713823301f066aad8ed5a6c\n" }, { "commit": "652b841483a07fc510489e2ab995419eb9ce88db", "tree": "172f07b5a3c50a4796a425919360a1585c0187a8", "parents": [ "53b7fc81f494dd38bec822c80694ee8175e1af26" ], "author": { "name": "PODISHETTY KUMAR", "email": "podishettyk@google.com", "time": "Tue Jan 23 06:19:36 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 23 06:19:36 2024 +0000" }, "message": "Revert \"Make BlockedNumberBackupAgent capable of restoring from newer OS version.\"\n\nThis reverts commit 53b7fc81f494dd38bec822c80694ee8175e1af26.\n\nReason for revert: \u003cReason for revert: Potential culprit for b/321865247 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\u003e\n\nChange-Id: I3f39a73638b42999f5141a6ea64fab04b11f605f\n" }, { "commit": "53b7fc81f494dd38bec822c80694ee8175e1af26", "tree": "9dc247f53270a004da25f1d8ef9ae2fd03b3d4a7", "parents": [ "3be3e07f9951457e01375f66068f7becf02f0e0d" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Jan 20 00:35:06 2024 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Jan 20 00:35:06 2024 +0000" }, "message": "Make BlockedNumberBackupAgent capable of restoring from newer OS version.\n\nAdding restoreAnyVersion removes the restriction that the OS version must\nbe less than or equal to that of the data being restored. Added a check\nin the onRestore method to check the backup file format version number to\nensure that it is not greater than the current supported version; if it\nis we will skip restoring the data.\n\nThis means that provided the blocked number format has NOT changed,\nyou can restore an SDK X+1 backup file to an SDK X device. This provides\na little bit more flexibility for users to restore from newer devices to\nolder devices and still retain their list of blocked numbers.\n\nFlag: Backup and restore is not flagable; this is also destined for next\nrelease.\nTest: Added unit test to verify that we cannot restore newer backup file\nversions.\nTest: Manual testing was performed to ensure that restoring from newer\nOS to older OS works providing the backup file format didn\u0027t change.\nBug: 317150223317053396\n\nChange-Id: I7f09ef1809cc74f9c655d5906284b071856c6139\n" }, { "commit": "3be3e07f9951457e01375f66068f7becf02f0e0d", "tree": "172f07b5a3c50a4796a425919360a1585c0187a8", "parents": [ "dca5f4530ff81fb7031d183fff9c425141e3c6b2", "842095ba257c92ef4e260bed134397afd75a0777" ], "author": { "name": "Joonhun Shin", "email": "joonhunshin@google.com", "time": "Thu Jan 04 10:19:59 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 04 10:19:59 2024 +0000" }, "message": "Merge \"Data only device(without FEATURE_TELEPHON_CALLING) : Add try/catch to handle UnsupportedOperationException\" into main" }, { "commit": "dca5f4530ff81fb7031d183fff9c425141e3c6b2", "tree": "2a89dec2d1d0b7f26e0366d8bfae45c617d436d7", "parents": [ "5701b9b2692ccbe42412910dbe1b9e42c2261925" ], "author": { "name": "Fangqiu Su", "email": "fangqiu@google.com", "time": "Tue Dec 19 18:13:10 2023 +0000" }, "committer": { "name": "Fangqiu Su", "email": "fangqiu@google.com", "time": "Tue Dec 19 18:38:49 2023 +0000" }, "message": "Update the imports to androidx.test.filters.*\n\nBug: 316941721\nTest: mmma .\nChange-Id: Ie40ca55cb37f7027ded939c700e07f655a31a593\n" }, { "commit": "842095ba257c92ef4e260bed134397afd75a0777", "tree": "6d79557561e0c5c5886db1d5a3b18564b8c8ca5b", "parents": [ "5701b9b2692ccbe42412910dbe1b9e42c2261925" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Tue Nov 14 12:39:17 2023 +0000" }, "committer": { "name": "Joonhun Shin", "email": "joonhunshin@google.com", "time": "Fri Dec 15 06:11:42 2023 +0000" }, "message": "Data only device(without FEATURE_TELEPHON_CALLING) : Add try/catch to handle UnsupportedOperationException\n\nIf the device does not have Telephony feature calling, the some of interfaces in TelephonyManager throw UnsupportedOperationException.\n\nBug: 297989574\nTest: oriole with ATT SIM, boot completed\n APM/data/wifi on/off\nChange-Id: I59f4ee69d26adc31a3b3f445dbcddac03c711d7c\n" }, { "commit": "5701b9b2692ccbe42412910dbe1b9e42c2261925", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "400c361ad8554fd95b3ecfd09b7d5b599c11b005", "80301c072730e04bf53a67c88da7639a6f86b835" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:57:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:57:59 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: eed1acc3ba -s ours am: 2fd035090f -s ours am: 80301c0727 -s ours\n\nam skip reason: Merged-In I64279462740e7c0e6e2df99164bbaeb5bae85ea4 with SHA-1 3776b81144 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2866418\n\nChange-Id: I0b2196298c8dc5b8becc813a2cde6862169dd61d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "80301c072730e04bf53a67c88da7639a6f86b835", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "079c8bbdda671d29c62678d971f88de285fc7509", "2fd035090f8f40db65c0eca0d91a2f432369ee4d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:02:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:02:47 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: eed1acc3ba -s ours am: 2fd035090f -s ours\n\nam skip reason: Merged-In I64279462740e7c0e6e2df99164bbaeb5bae85ea4 with SHA-1 3776b81144 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2866418\n\nChange-Id: Ie11ca1656d0508e9c0736de6eab97770acd2bf6b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2fd035090f8f40db65c0eca0d91a2f432369ee4d", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "3776b811440268b28b531e4fd4d05acf547310f3", "eed1acc3ba713ce697ab428862f2fdfbb27e20b9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:58 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: eed1acc3ba -s ours\n\nam skip reason: Merged-In I64279462740e7c0e6e2df99164bbaeb5bae85ea4 with SHA-1 3776b81144 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2866418\n\nChange-Id: I2af32c569fc9e0f3416aebf205cebf3a1e2c4d11\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eed1acc3ba713ce697ab428862f2fdfbb27e20b9", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "fa50daa5856f68518801dd2b7c4aec34b46d2777", "3776b811440268b28b531e4fd4d05acf547310f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:28 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:28 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: I64279462740e7c0e6e2df99164bbaeb5bae85ea4\nBug: 315507370\nChange-Id: I1ef8b92501c6b0e624401b5340524edf9463a38c\n" }, { "commit": "400c361ad8554fd95b3ecfd09b7d5b599c11b005", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "d472526402e70fcc143a0d596b349c08e2158be4", "079c8bbdda671d29c62678d971f88de285fc7509" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:55:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:55:00 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 3776b81144 -s ours am: 079c8bbdda -s ours\n\nam skip reason: Merged-In I420776f026f2cb7bb5b1440846c281d9decabb6c with SHA-1 b7c3e34481 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/25089450\n\nChange-Id: I6998a70283f9bed8835b001146fc6bff26fd732b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "079c8bbdda671d29c62678d971f88de285fc7509", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "b7c3e34481e65a0650a01064cc4b059cfe4c6978", "3776b811440268b28b531e4fd4d05acf547310f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:48:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:48:14 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 3776b81144 -s ours\n\nam skip reason: Merged-In I420776f026f2cb7bb5b1440846c281d9decabb6c with SHA-1 b7c3e34481 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/25089450\n\nChange-Id: Iacbfceaca90311681ae318d66f37be2ecac7d213\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3776b811440268b28b531e4fd4d05acf547310f3", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "3991431451f9c1bf18f2479af206ea76ade58730", "b7c3e34481e65a0650a01064cc4b059cfe4c6978" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:58 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:58 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: I420776f026f2cb7bb5b1440846c281d9decabb6c\nChange-Id: I64279462740e7c0e6e2df99164bbaeb5bae85ea4\n" }, { "commit": "d472526402e70fcc143a0d596b349c08e2158be4", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "93d5ed1971aab22e8a2afda7400e99684124df20", "b7c3e34481e65a0650a01064cc4b059cfe4c6978" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:41 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fa50daa585 -s ours am: 3991431451 -s ours am: 3b5b61b59d -s ours am: 0c6deccee0 -s ours am: b7c3e34481 -s ours\n\nam skip reason: Merged-In Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc with SHA-1 50eba897a2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2774983\n\nChange-Id: I98100f97ffb1d6ddc34e4315bea8fa858529ba2d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b7c3e34481e65a0650a01064cc4b059cfe4c6978", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "27e3bdfc1e6494620dcec4308cd1e0cec1319932", "0c6deccee0554b36ab38cd6afca6360be331bc65" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:01:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:01:11 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fa50daa585 -s ours am: 3991431451 -s ours am: 3b5b61b59d -s ours am: 0c6deccee0 -s ours\n\nam skip reason: Merged-In Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc with SHA-1 50eba897a2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2774983\n\nChange-Id: I420776f026f2cb7bb5b1440846c281d9decabb6c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c6deccee0554b36ab38cd6afca6360be331bc65", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "0c3865be1443e403df159d5e996b8d2883291503", "3b5b61b59debe64a781390d5b9832dc838b2bc8b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:21 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fa50daa585 -s ours am: 3991431451 -s ours am: 3b5b61b59d -s ours\n\nam skip reason: Merged-In Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc with SHA-1 50eba897a2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2774983\n\nChange-Id: I23184f714d29fd6c37383dd550d85d8c490339e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b5b61b59debe64a781390d5b9832dc838b2bc8b", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "6ed543d273323e51c21dcc2dfcf676acb5177c55", "3991431451f9c1bf18f2479af206ea76ade58730" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:41 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fa50daa585 -s ours am: 3991431451 -s ours\n\nam skip reason: Merged-In Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc with SHA-1 50eba897a2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2774983\n\nChange-Id: I427312490775be9e55ef5c020b6004d95b90e149\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3991431451f9c1bf18f2479af206ea76ade58730", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "1ac0f51f5b9456bbd6921ef370f63a13de1d39bd", "fa50daa5856f68518801dd2b7c4aec34b46d2777" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:40 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fa50daa585 -s ours\n\nam skip reason: Merged-In Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc with SHA-1 50eba897a2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2774983\n\nChange-Id: I191aa8efddf3cd823c22ac7cb8dde14414dbe82a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fa50daa5856f68518801dd2b7c4aec34b46d2777", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "e361566bada9120abcc2e2d9e914e9c77e2ee937", "1ac0f51f5b9456bbd6921ef370f63a13de1d39bd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:45 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:45 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc\nChange-Id: I835d683f6d07681a0429fc3e3c52338bff272b3b\n" }, { "commit": "93d5ed1971aab22e8a2afda7400e99684124df20", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "a3241ab290e5a72e57bbd9b7538bff8f4d0d0686", "27e3bdfc1e6494620dcec4308cd1e0cec1319932" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:35 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 1ac0f51f5b -s ours am: 6ed543d273 -s ours am: 0c3865be14 -s ours am: 27e3bdfc1e -s ours\n\nam skip reason: Merged-In I392f851936d230fff2d84e65d9262454fc2e05ab with SHA-1 f9a68b613e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/24182720\n\nChange-Id: Ibe2301b1f8b1e1a641a256204fa07bafb0cc6b8e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "27e3bdfc1e6494620dcec4308cd1e0cec1319932", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "260603f1aef0c2a12d5d117cbc5414788bb7f921", "0c3865be1443e403df159d5e996b8d2883291503" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:11:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:11:29 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 1ac0f51f5b -s ours am: 6ed543d273 -s ours am: 0c3865be14 -s ours\n\nam skip reason: Merged-In I392f851936d230fff2d84e65d9262454fc2e05ab with SHA-1 f9a68b613e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/24182720\n\nChange-Id: If140b7e289cbc85cb31f5c14163774818992f27c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c3865be1443e403df159d5e996b8d2883291503", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "9e1b450f110288d73701af85ab401dba5799394b", "6ed543d273323e51c21dcc2dfcf676acb5177c55" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:46 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 1ac0f51f5b -s ours am: 6ed543d273 -s ours\n\nam skip reason: Merged-In I392f851936d230fff2d84e65d9262454fc2e05ab with SHA-1 f9a68b613e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/24182720\n\nChange-Id: Ifb53b090d88c5a5f9a62c062b8a4812c8786bb90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ed543d273323e51c21dcc2dfcf676acb5177c55", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "f9a68b613e5ee3c1f0e2954efb905a669d3470ba", "1ac0f51f5b9456bbd6921ef370f63a13de1d39bd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:47 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 1ac0f51f5b -s ours\n\nam skip reason: Merged-In I392f851936d230fff2d84e65d9262454fc2e05ab with SHA-1 f9a68b613e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/24182720\n\nChange-Id: I0a3bcbab6915039a26d8af9a95df5a429ebee3d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ac0f51f5b9456bbd6921ef370f63a13de1d39bd", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "e361566bada9120abcc2e2d9e914e9c77e2ee937", "f9a68b613e5ee3c1f0e2954efb905a669d3470ba" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:43:14 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:43:14 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I392f851936d230fff2d84e65d9262454fc2e05ab\nChange-Id: If20dbe6e13048308bb918dae1363b3b09815f8f7\n" }, { "commit": "a3241ab290e5a72e57bbd9b7538bff8f4d0d0686", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "beebc5b2aae3afb163379629b81d00562eee5502", "260603f1aef0c2a12d5d117cbc5414788bb7f921" ], "author": { "name": "Aishwarya Mallampati", "email": "amallampati@google.com", "time": "Fri Jun 16 18:03:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 16 18:03:21 2023 +0000" }, "message": "Allow both USER_SYSTEM and managed profile to block users. am: 8c6f2a0faa am: 260603f1ae\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/23605275\n\nChange-Id: I87f694537e03ed95c9da40aaaa7b6fcd6a09949f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "260603f1aef0c2a12d5d117cbc5414788bb7f921", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "73d0b396a873684f4f116b1938173f60e1d0d447", "8c6f2a0faab522ea36084077fbf5ff9b6955bbf6" ], "author": { "name": "Aishwarya Mallampati", "email": "amallampati@google.com", "time": "Fri Jun 16 17:17:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 16 17:17:57 2023 +0000" }, "message": "Allow both USER_SYSTEM and managed profile to block users. am: 8c6f2a0faa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/23605275\n\nChange-Id: Ib592dcfdbb0874504000ce780c6045cb6ec7cfff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8c6f2a0faab522ea36084077fbf5ff9b6955bbf6", "tree": "c82e4130d65f14b0c80ee71f9f3b7f6de24c1141", "parents": [ "a361741bed90624ad72760023b844c7256842921" ], "author": { "name": "Aishwarya Mallampati", "email": "amallampati@google.com", "time": "Wed Jun 07 21:06:10 2023 +0000" }, "committer": { "name": "Aishwarya Mallampati", "email": "amallampati@google.com", "time": "Thu Jun 08 21:12:25 2023 +0000" }, "message": "Allow both USER_SYSTEM and managed profile to block users.\n\nBug: 285343707\nTest: Flashed build on raven-userdebug and performed basic functionality\ntests.\nEnabled work profile and checked if we are able to block numbers\nfrom work profile phone app.\natest com.android.providers.blockednumber.BlockedNumberProviderTest\n\nChange-Id: I65d83fbd80becf7228548803dcd2b06ec8998f0e\n" }, { "commit": "beebc5b2aae3afb163379629b81d00562eee5502", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "d2020e2709b22f7666d363af6ee2c5d4b81e09d8", "73d0b396a873684f4f116b1938173f60e1d0d447" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 06:42:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 06:42:19 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours am: e361566bad -s ours am: 363927e4db -s ours am: f9a68b613e -s ours am: 9e1b450f11 -s ours am: 73d0b396a8 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: I6522acc116284fefa061a230b91558f1961a9d01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "73d0b396a873684f4f116b1938173f60e1d0d447", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "655b68f3f46c83eff460e7f836cf8a6a4f2e6aac", "9e1b450f110288d73701af85ab401dba5799394b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 05:54:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 05:54:35 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours am: e361566bad -s ours am: 363927e4db -s ours am: f9a68b613e -s ours am: 9e1b450f11 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: Ida4ff80d51fbbc0154e1c32de795442ff4a2b140\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e1b450f110288d73701af85ab401dba5799394b", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "655b68f3f46c83eff460e7f836cf8a6a4f2e6aac", "f9a68b613e5ee3c1f0e2954efb905a669d3470ba" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 05:13:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 05:13:49 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours am: e361566bad -s ours am: 363927e4db -s ours am: f9a68b613e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: I838dc947540b6778a0fe80b2b5329c7e98602606\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9a68b613e5ee3c1f0e2954efb905a669d3470ba", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "a6059300847fe98ac439958271f81510155fb92e", "363927e4dbd125aff9bbe219068b4196fa204679" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 04:32:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 04:32:01 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours am: e361566bad -s ours am: 363927e4db -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: I392f851936d230fff2d84e65d9262454fc2e05ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "363927e4dbd125aff9bbe219068b4196fa204679", "tree": "9ee9637ede2e655199bd6613c523745fea99c5b7", "parents": [ "7068d939cd8412aab4e3f32d3399b6e3304a62d1", "e361566bada9120abcc2e2d9e914e9c77e2ee937" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 04:26:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 04:26:44 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours am: e361566bad -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: I12aa21b5a6b79fe14b4d235db9dac3e3b03ebf23\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e361566bada9120abcc2e2d9e914e9c77e2ee937", "tree": "b8810d071206626365381f9b736aa02f380dfaa6", "parents": [ "4516201af77e5976fe78a54034b8dd9ed4f64a6a", "50eba897a2176aecf15adfc151fd962a49cb046a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Jun 08 03:45:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 08 03:45:26 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50eba897a2 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/2614265\n\nChange-Id: I7c910f569c3adccaf161ee510c7afcbf48638ff0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50eba897a2176aecf15adfc151fd962a49cb046a", "tree": "b8810d071206626365381f9b736aa02f380dfaa6", "parents": [ "2d52e15f977568819f336b51e7e41b34e40381b7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 04 16:14:55 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jun 04 16:14:55 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Idc3b0278edbcb7850e1ab08caf3f3f9b05ba11dc\n" }, { "commit": "d2020e2709b22f7666d363af6ee2c5d4b81e09d8", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "b7aa355fbd5cedd9e5b8f2130d614b0acdda9cbf", "7d773c1cd538647cf4b5421793512e6a625cce1e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Apr 29 01:42:07 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Sat Apr 29 01:42:07 2023 +0000" }, "message": "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7d773c1cd5\n\nBlank merge reason: commit message contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22912481\n\nChange-Id: Ie2c2bee9cbf916033fd48c074300f35093432717\n" }, { "commit": "7d773c1cd538647cf4b5421793512e6a625cce1e", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "4d1577356eb182b044c129c7610a23befcbff602" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 27 12:57:04 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 27 12:57:04 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ib80342299f0c3bccc96c3c8a97e9e849082cf050\n" }, { "commit": "b7aa355fbd5cedd9e5b8f2130d614b0acdda9cbf", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "caf00487f5b612d019be203bcfcd8a0ab1f3bc93", "655b68f3f46c83eff460e7f836cf8a6a4f2e6aac" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 25 19:01:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 25 19:01:22 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4516201af7 -s ours am: 7068d939cd -s ours am: a605930084 -s ours am: 655b68f3f4 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22799388\n\nChange-Id: Icb9565b7f130db7860fd7af1f8191095a1cea665\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "655b68f3f46c83eff460e7f836cf8a6a4f2e6aac", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "a361741bed90624ad72760023b844c7256842921", "a6059300847fe98ac439958271f81510155fb92e" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 25 16:45:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 25 16:45:16 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4516201af7 -s ours am: 7068d939cd -s ours am: a605930084 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22799388\n\nChange-Id: I59550b9f0cac3cdb118174d8015ff868fb0152e2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6059300847fe98ac439958271f81510155fb92e", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "65a2827820b09ec32bf9865d1af723930a64742c", "7068d939cd8412aab4e3f32d3399b6e3304a62d1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 25 15:42:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 25 15:42:30 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4516201af7 -s ours am: 7068d939cd -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22799388\n\nChange-Id: I3615857045c6b3de8e41b0c26543b2a7559f5240\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7068d939cd8412aab4e3f32d3399b6e3304a62d1", "tree": "9ee9637ede2e655199bd6613c523745fea99c5b7", "parents": [ "0b18affa88e07ad135611d8134be3d15dda96a43", "4516201af77e5976fe78a54034b8dd9ed4f64a6a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 25 15:00:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 25 15:00:49 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4516201af7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22799388\n\nChange-Id: I2d6012b34a5103b73ee07400a6beafa2bc67767f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4516201af77e5976fe78a54034b8dd9ed4f64a6a", "tree": "b8810d071206626365381f9b736aa02f380dfaa6", "parents": [ "0b18affa88e07ad135611d8134be3d15dda96a43" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Apr 22 00:02:21 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Apr 22 00:02:21 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: If6d10317fe9a2788e2acb433495859f1518c9984\n" }, { "commit": "caf00487f5b612d019be203bcfcd8a0ab1f3bc93", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "2a853b1903a165b7c61a6948581fca1276895969", "a361741bed90624ad72760023b844c7256842921" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 13 20:16:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 13 20:16:38 2023 +0000" }, "message": "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1002215697 am: 65a2827820 -s ours am: a361741bed -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22568542\n\nChange-Id: I5facaa7f358cc24c3e18dd2dede78ae663bc928b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a853b1903a165b7c61a6948581fca1276895969", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "d15a19ec4846d59c4c7cf8d9bac92ce7af48d399", "4d1577356eb182b044c129c7610a23befcbff602" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 13 20:15:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 13 20:15:56 2023 +0000" }, "message": "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1002215697 am: 65a2827820 -s ours am: 4d1577356e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22568542\n\nChange-Id: I7c331a590308487358b85473de1ad23ce451b047\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d1577356eb182b044c129c7610a23befcbff602", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "d82ac44a0c74fc1f9b022a4f4208cdfeadc8b754", "65a2827820b09ec32bf9865d1af723930a64742c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 13 20:14:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 13 20:14:09 2023 +0000" }, "message": "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1002215697 am: 65a2827820 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22568542\n\nChange-Id: I5463340739324fa7b58b110cdcdc735852d1bbb2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a361741bed90624ad72760023b844c7256842921", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "126137ad89647b671dff9ac861b86ff34c6f1fa8", "65a2827820b09ec32bf9865d1af723930a64742c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Apr 13 20:13:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 13 20:13:14 2023 +0000" }, "message": "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1002215697 am: 65a2827820 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22568542\n\nChange-Id: I97e6c6e2e302fe9770a6701066a43b3718b076fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "65a2827820b09ec32bf9865d1af723930a64742c", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "b9c8133cb98e5bdbafff46b2a754781a9f192593", "1002215697822f50a2dd5e6ae3255220bcce780d" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 11 22:44:42 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue Apr 11 22:44:42 2023 +0000" }, "message": "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1002215697\n\nBlank merge reason: commit message contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22568542\n\nChange-Id: Ie39fc82af8ff9bdb952e711332b91e5cc84a61e4\n" }, { "commit": "d15a19ec4846d59c4c7cf8d9bac92ce7af48d399", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "e4d8aa1e20105861b2d015dba14eb0c84319c735" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 11 13:00:14 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 11 13:00:14 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ie5b93ff9953c4e57a52965957ef577262256a2fc\n" }, { "commit": "1002215697822f50a2dd5e6ae3255220bcce780d", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "b02b4f738e0cb100ff523feaf75156e4eb0d65f0" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 11 01:23:34 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 11 01:23:34 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I7c1a17a91f7bb4799bb4e95feab999daf084f152\n" }, { "commit": "e4d8aa1e20105861b2d015dba14eb0c84319c735", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "63a47a09b3d5a59c7da44c678b703bf1bee3fd9f", "126137ad89647b671dff9ac861b86ff34c6f1fa8" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 23:42:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 23:42:03 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-d1-dev am: 126137ad89 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410438\n\nChange-Id: I829910684fd233404a61f3698d6129441507bffa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "63a47a09b3d5a59c7da44c678b703bf1bee3fd9f", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "a511067674ee8f7fefa9633329488f1f8902dcb9", "53860c2fdc12ea9798d3708c5dd17cf2890670ee" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 23:41:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 23:41:44 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53860c2fdc -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410438\n\nChange-Id: I57d219313ee8bba0e2609bf28b1f5e5c5bea2d45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "126137ad89647b671dff9ac861b86ff34c6f1fa8", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "4835ba83f8b5cf7c7e3f8bb25c74798dca1c430a", "53860c2fdc12ea9798d3708c5dd17cf2890670ee" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 23:21:01 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 04 23:21:01 2023 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-d1-dev" }, { "commit": "a511067674ee8f7fefa9633329488f1f8902dcb9", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "69db9e4a5c0568a12bc766c9f0eb93f41ba168f1", "d82ac44a0c74fc1f9b022a4f4208cdfeadc8b754" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 04 04:58:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 04:58:47 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-dev am: b9c8133cb9 -s ours am: d82ac44a0c -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I8cb953545513a796d78675ebce2263cdabb4e5cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "69db9e4a5c0568a12bc766c9f0eb93f41ba168f1", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "548d5c6d618d31015269560ae1a044e42b48d9ea", "0cbb65166a9d6ccb32a881f123da46ea2b2b0282" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 04:58:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 04:58:29 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1320fc196a -s ours am: 0cbb65166a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I71646cb9e2f40675f3e6becd18ccd92efa12efd6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "548d5c6d618d31015269560ae1a044e42b48d9ea", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "f69304621eeeca5d87c0d871cb122662e9fc8a5a", "4835ba83f8b5cf7c7e3f8bb25c74798dca1c430a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 04 03:55:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:55:39 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-dev am: b9c8133cb9 -s ours am: 4835ba83f8 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I4aa234c5114fc26c4732fe66cc00c73f76cbbfc9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f69304621eeeca5d87c0d871cb122662e9fc8a5a", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "8749157b0fdd0ae7463e73629c2f1c93baadc5c9", "50e39d64d0f81989cfabbf8ffadd721ad6a8267d" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 03:55:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:55:19 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1320fc196a -s ours am: 50e39d64d0 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I03e238f2cd6b60b0a00ae82bfb02495607eea120\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4835ba83f8b5cf7c7e3f8bb25c74798dca1c430a", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "50e39d64d0f81989cfabbf8ffadd721ad6a8267d", "b9c8133cb98e5bdbafff46b2a754781a9f192593" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 04 03:29:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:29:17 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-dev am: b9c8133cb9 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I06ceacfbf264cc5eed1054d234996919c21a7c4b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d82ac44a0c74fc1f9b022a4f4208cdfeadc8b754", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "0cbb65166a9d6ccb32a881f123da46ea2b2b0282", "b9c8133cb98e5bdbafff46b2a754781a9f192593" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 04 03:28:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:28:58 2023 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-dev am: b9c8133cb9 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I2bfe5b6070e201fa718a40e9f688415aa848868c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50e39d64d0f81989cfabbf8ffadd721ad6a8267d", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "1b07097448a6f8d15add0f2a97823eb6752e49f3", "1320fc196ac728ceba4883c2687910635ad5567d" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 03:28:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:28:58 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1320fc196a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: I14dcba920808bd6a02114cf88302052fc07f818b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0cbb65166a9d6ccb32a881f123da46ea2b2b0282", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "ffbdcdc140933742b791a4f1f5eb627352b7a079", "1320fc196ac728ceba4883c2687910635ad5567d" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 03:28:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:28:39 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1320fc196a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22410435\n\nChange-Id: If02bc7ce314658830380fb4ae6d6900f77db7225\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8749157b0fdd0ae7463e73629c2f1c93baadc5c9", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "75482e35a23c76d8ec3d3394d6cdaf98da858151", "ffbdcdc140933742b791a4f1f5eb627352b7a079" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 04 03:14:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 04 03:14:40 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours am: 0b18affa88 -s ours am: bb9e0a49de -s ours am: ffbdcdc140 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: Ic9fa31e59cfb490ebea75ef49a634b7518d59288\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9c8133cb98e5bdbafff46b2a754781a9f192593", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "bb9e0a49de363fa75f378011b89afa4eec92907b", "1320fc196ac728ceba4883c2687910635ad5567d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 04 02:54:43 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 04 02:54:43 2023 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into udc-dev" }, { "commit": "ffbdcdc140933742b791a4f1f5eb627352b7a079", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440", "bb9e0a49de363fa75f378011b89afa4eec92907b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Apr 03 20:59:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 03 20:59:38 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours am: 0b18affa88 -s ours am: bb9e0a49de -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: Ia333798346d341d2d32a94d54d544f56295f6a9f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "53860c2fdc12ea9798d3708c5dd17cf2890670ee", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 15:32:58 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 15:32:58 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I22643ef145319b03381d143ca8b5f4ccfb732aca\n" }, { "commit": "1320fc196ac728ceba4883c2687910635ad5567d", "tree": "c3424445fa288da98ec68432e24c116a341b9a44", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 15:07:30 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 15:07:30 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Iae3174625d7840c6b2e6c8f963bf4b48add47c1d\n" }, { "commit": "75482e35a23c76d8ec3d3394d6cdaf98da858151", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440", "1b07097448a6f8d15add0f2a97823eb6752e49f3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 19:48:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Apr 02 19:48:24 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours am: 0b18affa88 -s ours am: bb9e0a49de -s ours am: 1b07097448 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: I79160b2c492887ab624a1d6bfe771f9de02e4e0d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1b07097448a6f8d15add0f2a97823eb6752e49f3", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440", "bb9e0a49de363fa75f378011b89afa4eec92907b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 19:20:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Apr 02 19:20:52 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours am: 0b18affa88 -s ours am: bb9e0a49de -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: Idb2dca1209d70a5a6625194d880a4faf0aa72c0b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb9e0a49de363fa75f378011b89afa4eec92907b", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "cce86fe90dfb7afeb08107c96e8a463a957fc440", "0b18affa88e07ad135611d8134be3d15dda96a43" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 19:17:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Apr 02 19:17:42 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours am: 0b18affa88 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: Ia5a6f6bd827bdb414e456b490cdc39eaa430ab50\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b18affa88e07ad135611d8134be3d15dda96a43", "tree": "9ee9637ede2e655199bd6613c523745fea99c5b7", "parents": [ "2d52e15f977568819f336b51e7e41b34e40381b7", "4e285173380777ade6c63606b678af885a9978f3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Apr 02 18:45:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Apr 02 18:45:22 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e28517338 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/22391392\n\nChange-Id: I936b600c965a775626d3750ef0e324fdefeda4f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e285173380777ade6c63606b678af885a9978f3", "tree": "b8810d071206626365381f9b736aa02f380dfaa6", "parents": [ "02fcbd6ca1a32176d0c11acff67bc314924ba8b0" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Mar 31 17:27:40 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Mar 31 17:27:40 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I5da050773d9c34bc7a903ad52b2a6d3abbbfd94b\n" }, { "commit": "cce86fe90dfb7afeb08107c96e8a463a957fc440", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "2005f4322e90cc5d55139a876f4639a8e4be0c40", "b02b4f738e0cb100ff523feaf75156e4eb0d65f0" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Wed Jan 25 20:35:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 25 20:35:33 2023 +0000" }, "message": "Merge \"Update preparers to align across everything\" into tm-mainline-prod am: b02b4f738e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/BlockedNumberProvider/+/20709593\n\nChange-Id: Ifcbdf906a966d8d0dee27ee8e10aacc1363c05c6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b02b4f738e0cb100ff523feaf75156e4eb0d65f0", "tree": "85182592db07fb47dfd89786812cf589b846cbae", "parents": [ "0d6d8b9c907e119e9f3622d4867c159e265e656e", "7b33aa7e3fd89537e7a706f19c2071d67043e671" ], "author": { "name": "Julien Desprez", "email": "jdesprez@google.com", "time": "Wed Jan 25 19:55:26 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 25 19:55:26 2023 +0000" }, "message": "Merge \"Update preparers to align across everything\" into tm-mainline-prod" } ], "next": "2005f4322e90cc5d55139a876f4639a8e4be0c40" }