)]}' { "log": [ { "commit": "356b975768f894c42b0b989e97fbdcd0bef8cbbf", "tree": "d94a8934acbc0e12feab9addd37db38d81977221", "parents": [ "2844b0768da18a1b945001f038e06c45d6cda274", "aa0c17a33ea7e377ed7dbfcce2168cae6e198d3a" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Thu Jan 09 10:07:34 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 10:07:34 2025 -0800" }, "message": "Removing upstream flag as it is now the default. am: aa0c17a33e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/3442920\n\nChange-Id: I91c9895624b96525d81d45c509468c08c8e7380d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa0c17a33ea7e377ed7dbfcce2168cae6e198d3a", "tree": "d94a8934acbc0e12feab9addd37db38d81977221", "parents": [ "7089a5f96ffce6d26b5a492ef23c0569332da920" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Jan 08 21:05:32 2025 +0000" }, "committer": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Jan 08 21:05:32 2025 +0000" }, "message": "Removing upstream flag as it is now the default.\nAlso moving to internal robolectric projects to no longer use the _upstream suffix.\n\nTest: CI\nBug: 386652866\nChange-Id: If210e213cf2e34ff94c4e0f34cc21cd1d00a2337\n" }, { "commit": "2844b0768da18a1b945001f038e06c45d6cda274", "tree": "63fc00cb24bad9c771d7ad76018c45c929603004", "parents": [ "2600d99e4b3380d1755db1ba28a0ca094a16fd37", "7089a5f96ffce6d26b5a492ef23c0569332da920" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Jan 07 13:56:50 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 07 13:56:50 2025 -0800" }, "message": "Removing Dead Flag am: 7089a5f96f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/3433895\n\nChange-Id: I3a36b25204979d6aa2434e8d2007597d9e7bb6b6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7089a5f96ffce6d26b5a492ef23c0569332da920", "tree": "63fc00cb24bad9c771d7ad76018c45c929603004", "parents": [ "2600d99e4b3380d1755db1ba28a0ca094a16fd37" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Sun Dec 29 19:45:01 2024 +0000" }, "committer": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Sun Dec 29 19:45:01 2024 +0000" }, "message": "Removing Dead Flag\nTest: CI\nBug: 386652866\n\nChange-Id: Ibf9576556ebf3554d5b8b47dac0641bca482bee0\n" }, { "commit": "2600d99e4b3380d1755db1ba28a0ca094a16fd37", "tree": "aedee62830acf1b7895f0e10ac9d0873c5445b89", "parents": [ "1fb4d86891af6d3849ed62ffa3797cc2d60e86b9", "a4346629c71691d1a121e05ae9c2e1c91d761631" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 23:12:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 23:12:58 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: a4346629c7 -s ours\n\nam skip reason: Merged-In I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad with SHA-1 9ffe9efcc2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/27145056\n\nChange-Id: Ie739fc3c460ffc3e7e103559632ea75e26f06628\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a4346629c71691d1a121e05ae9c2e1c91d761631", "tree": "aedee62830acf1b7895f0e10ac9d0873c5445b89", "parents": [ "33c391d33b1faf9d3e4f234fa870b1fb110ffd89", "1fb4d86891af6d3849ed62ffa3797cc2d60e86b9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:51:33 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:51:33 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad\nChange-Id: Ib58f65d3d85dd68ca2c6626186e8e9a122d8ffe4\n" }, { "commit": "1fb4d86891af6d3849ed62ffa3797cc2d60e86b9", "tree": "aedee62830acf1b7895f0e10ac9d0873c5445b89", "parents": [ "7edf91d6fbf80633714e8ca686071f75590cb89a", "33c391d33b1faf9d3e4f234fa870b1fb110ffd89" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Mon Feb 12 23:59:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 12 23:59:38 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: e1be02488f am: 33c391d33b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2946509\n\nChange-Id: I04551777c3ed903b543041da869a4a27c75162ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "33c391d33b1faf9d3e4f234fa870b1fb110ffd89", "tree": "aedee62830acf1b7895f0e10ac9d0873c5445b89", "parents": [ "b16d2e27e219ee2794a0e257bd5dbcca99d9b12b", "e1be02488ff11c9bec34150031712b2b6a1f0a33" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Mon Feb 12 23:19:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 12 23:19:50 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model am: e1be02488f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2946509\n\nChange-Id: I81ce74974e288d6864e9f9e2ee272cfa0d70b466\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1be02488ff11c9bec34150031712b2b6a1f0a33", "tree": "aedee62830acf1b7895f0e10ac9d0873c5445b89", "parents": [ "b92a69630402906698ebded024481eeadc93a738" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 14:01:01 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 14:01:01 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: I76c18c2c33ae0cc30fa73be3b52470664daf80a4\n" }, { "commit": "7edf91d6fbf80633714e8ca686071f75590cb89a", "tree": "8929bf87ceefb652f28e73bbbb9938fe83de9274", "parents": [ "9ffe9efcc2a6ac38ef5160fb83ca82603110bf7e", "b16d2e27e219ee2794a0e257bd5dbcca99d9b12b" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Fri Jan 19 02:56:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 19 02:56:47 2024 +0000" }, "message": "[automerger skipped] Clean up empty jar reference am: b92a696304 am: b16d2e27e2 -s ours\n\nam skip reason: Merged-In I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad with SHA-1 9ffe9efcc2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2918746\n\nChange-Id: I4659d9da2b1234635fd8d2946fa9b46f23d36434\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b16d2e27e219ee2794a0e257bd5dbcca99d9b12b", "tree": "8929bf87ceefb652f28e73bbbb9938fe83de9274", "parents": [ "eb1089c8f9295bacfe2125d43bba1fb870fc6a1a", "b92a69630402906698ebded024481eeadc93a738" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Fri Jan 19 02:16:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 19 02:16:41 2024 +0000" }, "message": "Clean up empty jar reference am: b92a696304\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2918746\n\nChange-Id: I937abf8ac9f23ec8ea631460703380798a66db45\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b92a69630402906698ebded024481eeadc93a738", "tree": "8929bf87ceefb652f28e73bbbb9938fe83de9274", "parents": [ "19fb76451ece3f86ca62fe023a09fe97718a3dc0" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Fri Jan 19 00:04:05 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Jan 19 00:04:05 2024 +0000" }, "message": "Clean up empty jar reference\nUptesting is moving folks to /external/robolectric from /external/robolectric-shadows\n\nWe maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows\nRemoving a dependency on an empty jar\n\nBug: 314757990\nTest: atest (same 2 test fail before and after)\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9ffe9efcc2a6ac38ef5160fb83ca82603110bf7e)\nMerged-In: I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad\nChange-Id: I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad\n" }, { "commit": "9ffe9efcc2a6ac38ef5160fb83ca82603110bf7e", "tree": "8929bf87ceefb652f28e73bbbb9938fe83de9274", "parents": [ "eb1089c8f9295bacfe2125d43bba1fb870fc6a1a" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Sun Jan 14 02:02:32 2024 +0000" }, "committer": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Sun Jan 14 02:06:13 2024 +0000" }, "message": "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows\n\nWe maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows\nRemoving a dependency on an empty jar\n\nBug: 314757990\nTest: atest (same 2 test fail before and after)\nChange-Id: I22ff5b5da176fb99f6d2333bc4c26c5162b8f7ad\n" }, { "commit": "eb1089c8f9295bacfe2125d43bba1fb870fc6a1a", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "ab3cf27ae9b902801dbb03ed96224caf22e10ecf", "19fb76451ece3f86ca62fe023a09fe97718a3dc0" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 05:37:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 05:37:08 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 07a8ad4a9a am: 6a6b8ddd78 am: ae2927a2c4 am: 3d94c5777a am: 19fb76451e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2776569\n\nChange-Id: I7aa23a2090f210376ebac66495851ca37154fb73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19fb76451ece3f86ca62fe023a09fe97718a3dc0", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "d2e5950a1a7adcd372136ae020c85f56bef1e735", "3d94c5777a452a836098f277167a22038b2eef7b" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 05:20:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 05:20:14 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 07a8ad4a9a am: 6a6b8ddd78 am: ae2927a2c4 am: 3d94c5777a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2776569\n\nChange-Id: I5644e1aea9a601db929b47a2d49bbcf0f3143a6a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3d94c5777a452a836098f277167a22038b2eef7b", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "3c74873e4cbeb8e501e571e0ef7db1861e38c0dc", "ae2927a2c49fd4afc0e85bd84de5b5fdfa49ad46" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 04:46:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 04:46:30 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 07a8ad4a9a am: 6a6b8ddd78 am: ae2927a2c4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2776569\n\nChange-Id: I5ef02722af76114a8ba47bf18883da41c5cb9c11\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae2927a2c49fd4afc0e85bd84de5b5fdfa49ad46", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "7f83fa0f89dd56dd6e20ba899df1e9c6e8d9fc99", "6a6b8ddd78b34439612626a7dd0f70188692cb35" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 04:13:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 04:13:38 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 07a8ad4a9a am: 6a6b8ddd78\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2776569\n\nChange-Id: I8869e6b10d37dcd51379a6a55eee7bbe34aa4bfe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6a6b8ddd78b34439612626a7dd0f70188692cb35", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "22d2a4485cdef527ed0fa5b246f2d1781f80ccb6", "07a8ad4a9abce951a2bdee7f3c9a798e5016081f" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 03:41:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 03:41:41 2023 +0000" }, "message": "Clean up obsolete aliases for Truth. am: 07a8ad4a9a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2776569\n\nChange-Id: Ic69248a454cf49caaf910ba7b4dc828db617ed92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07a8ad4a9abce951a2bdee7f3c9a798e5016081f", "tree": "e3976c7d25e0531a0486edc3c70db995e3c88e99", "parents": [ "2c42524cd61f78a9ea28367a35cf273e26e27af1" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 00:48:12 2023 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Sat Oct 07 00:48:12 2023 +0000" }, "message": "Clean up obsolete aliases for Truth.\n\nBug: 255714762\nTest: presubmit\nChange-Id: If5777a06511a34dfcafdd5eab6e5543d702d9f17\n" }, { "commit": "ab3cf27ae9b902801dbb03ed96224caf22e10ecf", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "369472d8338868c1fa0d0d629502f05c95863494", "d2e5950a1a7adcd372136ae020c85f56bef1e735" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:45 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours am: 22d2a4485c -s ours am: 7f83fa0f89 -s ours am: 3c74873e4c -s ours am: d2e5950a1a -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009\n\nChange-Id: I5b0b90ad25dfe00d8bb75d55da5de3deb12181d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d2e5950a1a7adcd372136ae020c85f56bef1e735", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "825ff4b61f35307cfdd6b0c1aa9ce021cdc282a3", "3c74873e4cbeb8e501e571e0ef7db1861e38c0dc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:01:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:01:14 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours am: 22d2a4485c -s ours am: 7f83fa0f89 -s ours am: 3c74873e4c -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009\n\nChange-Id: I905bf994b773aa5ccec9301dd3e0ce3a6fd2017c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3c74873e4cbeb8e501e571e0ef7db1861e38c0dc", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "665d33c8b99f64df248e9776efb5cc65d95ee6cc", "7f83fa0f89dd56dd6e20ba899df1e9c6e8d9fc99" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:24 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours am: 22d2a4485c -s ours am: 7f83fa0f89 -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009\n\nChange-Id: I822d66e7cf1410eb6a409cf6ac50783acfb9092e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f83fa0f89dd56dd6e20ba899df1e9c6e8d9fc99", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "59afe62da6c23c20799d2292e5fef3f2a5f87111", "22d2a4485cdef527ed0fa5b246f2d1781f80ccb6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:43 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours am: 22d2a4485c -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009\n\nChange-Id: Id266ce37d24bc157e7d5c0b9d5135cf13dde6800\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "22d2a4485cdef527ed0fa5b246f2d1781f80ccb6", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "f064e8f41d2fb25ab5a334edabc5e6957ed588be", "2c42524cd61f78a9ea28367a35cf273e26e27af1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:43 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009\n\nChange-Id: Ib616e16be1ff661e140b86da8b707077c9541241\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2c42524cd61f78a9ea28367a35cf273e26e27af1", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "7294408c92106f8da51a99b4d34a5cfe2e48fb27", "f064e8f41d2fb25ab5a334edabc5e6957ed588be" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:40:41 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:40:41 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: Ide274c34a4d91d5fb9001f4b85a4d16828e145bc\nChange-Id: I65d044e892c558d22d610b01bfc3cb2d71e5aee0\n" }, { "commit": "369472d8338868c1fa0d0d629502f05c95863494", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "2e24f06e123e478f0eb30e8128293351affca600", "825ff4b61f35307cfdd6b0c1aa9ce021cdc282a3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:38 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: f064e8f41d -s ours am: 59afe62da6 -s ours am: 665d33c8b9 -s ours am: 825ff4b61f -s ours\n\nam skip reason: Merged-In I8111fd6e368c82125662bca06906fbe729241da2 with SHA-1 974430d02c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/24182680\n\nChange-Id: If108ac5ee73ed062a5b151e897678f09d6249224\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "825ff4b61f35307cfdd6b0c1aa9ce021cdc282a3", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "6d78bfc432905f0076f953bd8dfd72e9a31902f6", "665d33c8b99f64df248e9776efb5cc65d95ee6cc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:11:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:11:32 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: f064e8f41d -s ours am: 59afe62da6 -s ours am: 665d33c8b9 -s ours\n\nam skip reason: Merged-In I8111fd6e368c82125662bca06906fbe729241da2 with SHA-1 974430d02c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/24182680\n\nChange-Id: I9d62c28510c15e631485311f3051bb716e392e55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "665d33c8b99f64df248e9776efb5cc65d95ee6cc", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "d33ce2e57d34bcacac2fba4cdce8ca328eace434", "59afe62da6c23c20799d2292e5fef3f2a5f87111" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:49 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: f064e8f41d -s ours am: 59afe62da6 -s ours\n\nam skip reason: Merged-In I8111fd6e368c82125662bca06906fbe729241da2 with SHA-1 974430d02c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/24182680\n\nChange-Id: I62836e9bb7f937d1464b09446990f691239b38fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "59afe62da6c23c20799d2292e5fef3f2a5f87111", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "965d7d715a54ac30d1e04bc320fdbb356eaa8c68", "f064e8f41d2fb25ab5a334edabc5e6957ed588be" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:50 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: f064e8f41d -s ours\n\nam skip reason: Merged-In I8111fd6e368c82125662bca06906fbe729241da2 with SHA-1 974430d02c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/24182680\n\nChange-Id: Ia61cb66ae57ddeca2acf87b8e5884d3730779dcd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f064e8f41d2fb25ab5a334edabc5e6957ed588be", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "d9890b56d85802582ae661ea9a829cd2e8cb8da4", "974430d02c7b5df322c2bb72519ae8fa5d42a1a0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:40:43 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:40:43 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I8111fd6e368c82125662bca06906fbe729241da2\nChange-Id: I38bed54e466c116f87f78c13a2a8b25e057b061a\n" }, { "commit": "2e24f06e123e478f0eb30e8128293351affca600", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "78d2479343f9dda1fa358d65e785dfff4c3dd225", "6d78bfc432905f0076f953bd8dfd72e9a31902f6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 27 08:06:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 27 08:06:18 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours am: d9890b56d8 -s ours am: 34afc68fb8 -s ours am: 965d7d715a -s ours am: d33ce2e57d -s ours am: 6d78bfc432 -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: I3a5f4c5f24b554428050475eeb827b320660d314\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6d78bfc432905f0076f953bd8dfd72e9a31902f6", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "52b5825d0a331118d0101dbc99ed3e089c655802", "d33ce2e57d34bcacac2fba4cdce8ca328eace434" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 27 07:26:05 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 27 07:26:05 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours am: d9890b56d8 -s ours am: 34afc68fb8 -s ours am: 965d7d715a -s ours am: d33ce2e57d -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: I182c2457061b0f6d9226ea0591146b0f224cc2f2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d33ce2e57d34bcacac2fba4cdce8ca328eace434", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "52b5825d0a331118d0101dbc99ed3e089c655802", "965d7d715a54ac30d1e04bc320fdbb356eaa8c68" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 27 01:14:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 27 01:14:27 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours am: d9890b56d8 -s ours am: 34afc68fb8 -s ours am: 965d7d715a -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: Ideb4ea9cb3e1f01325ceec8ca6bb8099f38f7bce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "965d7d715a54ac30d1e04bc320fdbb356eaa8c68", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "974430d02c7b5df322c2bb72519ae8fa5d42a1a0", "34afc68fb8b64a887ad373c5596e11339d4dbc01" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 27 00:32:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 27 00:32:56 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours am: d9890b56d8 -s ours am: 34afc68fb8 -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: I03c81ede3403ec08904ccb2ac444ff045597e1b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "34afc68fb8b64a887ad373c5596e11339d4dbc01", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "3739fea3169de245bf444b3fc4c17c81fbfcd955", "d9890b56d85802582ae661ea9a829cd2e8cb8da4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 26 23:10:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 26 23:10:48 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours am: d9890b56d8 -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: I9553cfa28cab43eed0ff67f79262d18d411fd516\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9890b56d85802582ae661ea9a829cd2e8cb8da4", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "04b4f6c0a5d25d375b37692ff0d48800f78f4e8a", "7294408c92106f8da51a99b4d34a5cfe2e48fb27" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 26 22:58:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 26 22:58:03 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 am: 7294408c92 -s ours\n\nam skip reason: Merged-In I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e with SHA-1 04b4f6c0a5 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2635451\n\nChange-Id: I2e8ddf1fbb756f023ed572cf60ca19db086ab1d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7294408c92106f8da51a99b4d34a5cfe2e48fb27", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "c9843a1722ff30d0e820e3dfc73d6ef1d266df7a", "04b4f6c0a5d25d375b37692ff0d48800f78f4e8a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 21 15:16:01 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 21 15:16:01 2023 -0700" }, "message": "Merge Android 13 QPR3\n\nBug: 275386652\nMerged-In: I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e\nChange-Id: Iac3349859aab544de953c2e5722fecb0ef77c59a\n" }, { "commit": "78d2479343f9dda1fa358d65e785dfff4c3dd225", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "d35a9f8c782b621da27c2430830b94dbff843885", "52b5825d0a331118d0101dbc99ed3e089c655802" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 21 23:53:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 21 23:53:06 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 04b4f6c0a5 -s ours am: 3739fea316 -s ours am: 974430d02c -s ours am: 52b5825d0a -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/22725147\n\nChange-Id: I679763d8869dd0494cecd24e337c08a567e9624a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "52b5825d0a331118d0101dbc99ed3e089c655802", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "d35a9f8c782b621da27c2430830b94dbff843885", "974430d02c7b5df322c2bb72519ae8fa5d42a1a0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 21 23:12:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 21 23:12:25 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 04b4f6c0a5 -s ours am: 3739fea316 -s ours am: 974430d02c -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/22725147\n\nChange-Id: I6d70080a821c79fdd593ee486738d21e6c46c848\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "974430d02c7b5df322c2bb72519ae8fa5d42a1a0", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "d35a9f8c782b621da27c2430830b94dbff843885", "3739fea3169de245bf444b3fc4c17c81fbfcd955" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 21 22:35:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 21 22:35:09 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 04b4f6c0a5 -s ours am: 3739fea316 -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/22725147\n\nChange-Id: I8111fd6e368c82125662bca06906fbe729241da2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3739fea3169de245bf444b3fc4c17c81fbfcd955", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "10e060d3744a401d420f4e3d6da2dcdd5608c8e3", "04b4f6c0a5d25d375b37692ff0d48800f78f4e8a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Apr 21 18:16:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 21 18:16:13 2023 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 04b4f6c0a5 -s ours\n\nam skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/22725147\n\nChange-Id: Ib4a00e7f9bbf7965dfbabd44315ef380dfb7ade2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "04b4f6c0a5d25d375b37692ff0d48800f78f4e8a", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "c9843a1722ff30d0e820e3dfc73d6ef1d266df7a", "10e060d3744a401d420f4e3d6da2dcdd5608c8e3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Apr 18 16:34:11 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Apr 18 16:34:11 2023 -0700" }, "message": "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994\n\nBug: 275386652\nMerged-In: Ide274c34a4d91d5fb9001f4b85a4d16828e145bc\nChange-Id: I1d9508e7e99f3c12b38cb977201c81c6bfa7fd1e\n" }, { "commit": "d35a9f8c782b621da27c2430830b94dbff843885", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "f208df48ae6e58124639d05f84f48489aeb5563a", "10e060d3744a401d420f4e3d6da2dcdd5608c8e3" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Feb 07 03:19:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 07 03:19:11 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d am: 8b81b05498 am: a0234da89a am: 10e060d374\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: I4e46d9a77e157d6980fa66087d60b84b43edc395\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10e060d3744a401d420f4e3d6da2dcdd5608c8e3", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "c9843a1722ff30d0e820e3dfc73d6ef1d266df7a", "a0234da89a24216be2d479227e399acaabfffb02" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Feb 07 01:57:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 07 01:57:28 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d am: 8b81b05498 am: a0234da89a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: Ica7d3f725494a215be2e0a65ef663082301da460\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f208df48ae6e58124639d05f84f48489aeb5563a", "tree": "bda43a28dc47b636fd4c231e2362c68ec61725f4", "parents": [ "e3560288464bb4c9257c3c770156aa3b6615e439", "7520a5facc2f97e3fa0d6dfca3260110d99fa325" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Feb 07 00:27:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 07 00:27:51 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d am: 7520a5facc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: Ie3b0aaad266ff85d8d3a6a0485742981258c5c9b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0234da89a24216be2d479227e399acaabfffb02", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "2dc3c73c8d86828d36d6af7975b792db1e1b3826", "8b81b054981908f5c3e04d3b4cd46c84e0b3f504" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Tue Feb 07 00:27:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 07 00:27:25 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d am: 8b81b05498\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: I3641f2a2abf3457fc463a82322e3b89635746dea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b81b054981908f5c3e04d3b4cd46c84e0b3f504", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "a6448a12de0ad3f81320679d9c71d45e9a6b9b94", "eb2cfc499d446063c9224ec0787a9d2f637eed62" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Mon Feb 06 23:08:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 06 23:08:58 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: I7a6b76dc61161c202775b06228918be3ec669773\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7520a5facc2f97e3fa0d6dfca3260110d99fa325", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "245fadb7cda4feb035a343b4aa9d3762a281a03b", "eb2cfc499d446063c9224ec0787a9d2f637eed62" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Mon Feb 06 23:07:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 06 23:07:52 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric am: eb2cfc499d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/21166840\n\nChange-Id: Ib6d08becff2a9f0416528bdd6b516c662c10404d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eb2cfc499d446063c9224ec0787a9d2f637eed62", "tree": "d1163c7ce55ca58379d8ba9916c097d714a8555f", "parents": [ "fa53f6ee90425b3f31f4dbe621e65efd7754821e" ], "author": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Feb 01 17:33:39 2023 +0000" }, "committer": { "name": "Rex Hoffman", "email": "rexhoffman@google.com", "time": "Wed Feb 01 17:33:39 2023 +0000" }, "message": "Upgrade robolectric version to /external/robolectric\n\nBug: 261728063\nTest: atest on robolectric soong module.\nChange-Id: Ide274c34a4d91d5fb9001f4b85a4d16828e145bc\n" }, { "commit": "e3560288464bb4c9257c3c770156aa3b6615e439", "tree": "3bb393c7a98d64b37d1560a0cc639b3068dcc566", "parents": [ "baea6880857560f569dd2be665e5dede3a044825", "c9843a1722ff30d0e820e3dfc73d6ef1d266df7a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 06:51:17 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 06:51:17 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: cd1a1608ea -s ours am: 2d07bb7d75 -s ours am: 3137a63049 -s ours am: c9843a1722 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2186817\n\nChange-Id: I5665936586b5367161f14617298e6e92dc024c01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9843a1722ff30d0e820e3dfc73d6ef1d266df7a", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "f6cac7bc891d63de8cf796ac1ad8f11d0d750f14", "3137a63049c22ea6f9f07c2714c924a78697bca0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 00:07:29 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 00:07:29 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: cd1a1608ea -s ours am: 2d07bb7d75 -s ours am: 3137a63049 -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2186817\n\nChange-Id: Ic4ad071125b3c0c87b1490c4c2b355fd908c33d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3137a63049c22ea6f9f07c2714c924a78697bca0", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "240a7e752971374236402bb6f00796354f99ef7d", "2d07bb7d75df8a8183c1523b785abf321bf98129" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 16 23:50:38 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 16 23:50:38 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: cd1a1608ea -s ours am: 2d07bb7d75 -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2186817\n\nChange-Id: I72d502d265d477a46a3c2a652d04b8f42a7abde7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2d07bb7d75df8a8183c1523b785abf321bf98129", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "e92542863f0066bb70364725efafc1250b30f427", "cd1a1608ea64931183b89f3f946a12d682b3309b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 16 23:08:54 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 16 23:08:54 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: cd1a1608ea -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2186817\n\nChange-Id: Ib1a72eed082df5e95f8673f4e2cad2862c69f2a6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd1a1608ea64931183b89f3f946a12d682b3309b", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "89fb2b67974da43b9bf69adfcf0cc860af71733e", "c4c7bd851ef29069681778cfedca27feb226003d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 15 22:03:38 2022 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 15 22:03:38 2022 -0700" }, "message": "DO NOT MERGE - Merge Android 13\n\nBug: 242648940\nMerged-In: I1eb7e02cc2b805b381f3dd3439ec68f958949e48\nChange-Id: I66407585a3b3ca81edc7b7d6c3d6f860914dc151\n" }, { "commit": "baea6880857560f569dd2be665e5dede3a044825", "tree": "3bb393c7a98d64b37d1560a0cc639b3068dcc566", "parents": [ "3b4aa6301d5ec8d1b1c159fa92da16d80e14b7a0", "e44e90ebad66867a928a6d17b928c06123eac1b3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 27 00:58:52 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 27 00:58:52 2022 +0000" }, "message": "Merge \"Open two LcoaleStore apis for TV usage.\"" }, { "commit": "e44e90ebad66867a928a6d17b928c06123eac1b3", "tree": "3bb393c7a98d64b37d1560a0cc639b3068dcc566", "parents": [ "e7aa3cf96b1f4e03fd3fff47edd9d56f168b7d2e" ], "author": { "name": "Zhizhi Liu", "email": "zhizhiliu@google.com", "time": "Tue Jul 26 22:59:12 2022 +0000" }, "committer": { "name": "Zhizhi Liu", "email": "zhizhiliu@google.com", "time": "Tue Jul 26 23:30:47 2022 +0000" }, "message": "Open two LcoaleStore apis for TV usage.\n\nMirroring the CL ag/18792158 to avoid future syncing issue.\nBug: 233835377\n\nTest: mm LocalePickerRoboTests\nChange-Id: I3c62f90108ef16d5818b84701aad334f2b354526\n" }, { "commit": "3b4aa6301d5ec8d1b1c159fa92da16d80e14b7a0", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "e7aa3cf96b1f4e03fd3fff47edd9d56f168b7d2e", "f6cac7bc891d63de8cf796ac1ad8f11d0d750f14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 30 01:05:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 30 01:05:32 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c4c7bd851e -s ours am: e92542863f -s ours am: 240a7e7529 -s ours am: f6cac7bc89 -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/19093385\n\nChange-Id: Id67d718577ad2c7e1994be1a0d3608a07596fc89\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f6cac7bc891d63de8cf796ac1ad8f11d0d750f14", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d9b79e93105c670cde7e9c993f962a2cc640d766", "240a7e752971374236402bb6f00796354f99ef7d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 30 00:02:58 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 30 00:02:58 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c4c7bd851e -s ours am: e92542863f -s ours am: 240a7e7529 -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/19093385\n\nChange-Id: I4d67addb1de2b4f2d1f26c37b534d3b251183438\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "240a7e752971374236402bb6f00796354f99ef7d", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d5b2a0d2a24af117c4cda66816a42abf4383bb29", "e92542863f0066bb70364725efafc1250b30f427" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 29 22:57:18 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 22:57:18 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c4c7bd851e -s ours am: e92542863f -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/19093385\n\nChange-Id: Ifb9f38dbded97b0f9d5055a3121df252388fd828\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e92542863f0066bb70364725efafc1250b30f427", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d86690c98c852983117c87e7120b71c75eb17ded", "c4c7bd851ef29069681778cfedca27feb226003d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 29 22:13:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 22:13:45 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c4c7bd851e -s ours\n\nam skip reason: Merged-In I1eb7e02cc2b805b381f3dd3439ec68f958949e48 with SHA-1 fa53f6ee90 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/19093385\n\nChange-Id: I7ee7b5fd9a7e8617f2ca3ae8c61d9e75cffc29f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c4c7bd851ef29069681778cfedca27feb226003d", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "89fb2b67974da43b9bf69adfcf0cc860af71733e", "d86690c98c852983117c87e7120b71c75eb17ded" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 27 23:38:50 2022 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 27 23:38:50 2022 +0000" }, "message": "Merge tm-dev-plus-aosp-without-vendor@8763363\n\nBug: 236760014\nMerged-In: I1eb7e02cc2b805b381f3dd3439ec68f958949e48\nChange-Id: I11e48cc6ee69a0133ac2095307f7d36e563f7d6d\n" }, { "commit": "e7aa3cf96b1f4e03fd3fff47edd9d56f168b7d2e", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "4f3943d57ad88c61afad61fd308a272052a241a1", "d9b79e93105c670cde7e9c993f962a2cc640d766" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 08:22:26 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 08:22:26 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de am: d5b2a0d2a2 am: d9b79e9310\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I91402d2ba29206c72fb30c110dd121a6692ca50f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f3943d57ad88c61afad61fd308a272052a241a1", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "4e8ba34dda3406da658968a0e7528346561e4963", "c1803f03b846b1c5a44fd23c26ebc4a100b10d8c" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 08:21:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 08:21:50 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: d86690c98c am: 23b4eb95e7 am: c1803f03b8\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I4423498699a4ca4b1ff18aa7a8041eca79dee597\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e8ba34dda3406da658968a0e7528346561e4963", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "ab3a050ff4844a562df8828c2be6515d683a2e30", "5de9bba4593180a740f514df8276ecd986e4325c" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 08:19:23 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 08:19:23 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de am: 2dc3c73c8d am: 5de9bba459\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Idff7e14e38d63e87b36b2cf47efe57b5e8edebba\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9b79e93105c670cde7e9c993f962a2cc640d766", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "c1803f03b846b1c5a44fd23c26ebc4a100b10d8c", "d5b2a0d2a24af117c4cda66816a42abf4383bb29" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:28:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:28:21 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de am: d5b2a0d2a2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I71375f2341ad42567a10ae7040c329d6131539a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c1803f03b846b1c5a44fd23c26ebc4a100b10d8c", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "5de9bba4593180a740f514df8276ecd986e4325c", "23b4eb95e76a22fb95583eed4f077758b758868f" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:27:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:27:30 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: d86690c98c am: 23b4eb95e7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I5d4568e0d21ef70e6bf6adea0b5a6ce8693baaf4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5de9bba4593180a740f514df8276ecd986e4325c", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "2dc3c73c8d86828d36d6af7975b792db1e1b3826" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:27:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:27:21 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de am: 2dc3c73c8d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I49d30e4cf37d53742a4386d7808d951feacdfac4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d5b2a0d2a24af117c4cda66816a42abf4383bb29", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "23b4eb95e76a22fb95583eed4f077758b758868f", "a6448a12de0ad3f81320679d9c71d45e9a6b9b94" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:09:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:09:09 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: I36cc8e01dfa41ba711f4125d1f05daa9b352c8ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "23b4eb95e76a22fb95583eed4f077758b758868f", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "d86690c98c852983117c87e7120b71c75eb17ded" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:08:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:08:57 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: d86690c98c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Iad639c31c06efd7b9cb5a7c1c1019403456f0f3f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2dc3c73c8d86828d36d6af7975b792db1e1b3826", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "a6448a12de0ad3f81320679d9c71d45e9a6b9b94" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:08:53 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:08:53 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: a6448a12de\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Ie4d662751c6eadaa3282d203e9f536759d3e6a3c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab3a050ff4844a562df8828c2be6515d683a2e30", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "245fadb7cda4feb035a343b4aa9d3762a281a03b" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 07:08:32 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 07:08:32 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90 am: 245fadb7cd\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: If7215cbafe7756c6927e6b60c6a7b9de51a4e5fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6448a12de0ad3f81320679d9c71d45e9a6b9b94", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "fa53f6ee90425b3f31f4dbe621e65efd7754821e" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 06:34:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 06:34:06 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Ifff228eed55f695a43e80684d22888ae412f082c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "245fadb7cda4feb035a343b4aa9d3762a281a03b", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "fa53f6ee90425b3f31f4dbe621e65efd7754821e" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 06:33:35 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 06:33:35 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Icb46cf7aad002d9b539809a2bba7acc584592c5e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d86690c98c852983117c87e7120b71c75eb17ded", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe", "fa53f6ee90425b3f31f4dbe621e65efd7754821e" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed May 04 06:32:22 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 04 06:32:22 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562\n\nChange-Id: Ifb42173fa272bee2f82559e6967e13466f0267a7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fa53f6ee90425b3f31f4dbe621e65efd7754821e", "tree": "8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce", "parents": [ "d77b797aa56f64bbb99ca532c16d0112a97841fe" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Tue Oct 26 17:29:18 2021 +0000" }, "committer": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Mon May 02 17:18:10 2022 +0000" }, "message": "Fix getLevelLocales crash due to modify collection during iteration\n\nBug: 196308793\nTest: mm LocalePickerRoboTests\nChange-Id: I1eb7e02cc2b805b381f3dd3439ec68f958949e48\n" }, { "commit": "d77b797aa56f64bbb99ca532c16d0112a97841fe", "tree": "6be252c17127169b37841a53b41a7d28a096aadd", "parents": [ "a28604146def30993e7abc3a5c6574b0737020ac", "89fb2b67974da43b9bf69adfcf0cc860af71733e" ], "author": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Tue Nov 16 16:10:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 16 16:10:22 2021 +0000" }, "message": "Migrate LocalePickerTest to Soong am: e2e39620a4 am: 0c6fa30a9a am: 42a1ac4015 am: 89fb2b6797\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1861853\n\nChange-Id: Icc7b1783019a5de441c3d308d647f5f431db0bd1\n" }, { "commit": "89fb2b67974da43b9bf69adfcf0cc860af71733e", "tree": "6be252c17127169b37841a53b41a7d28a096aadd", "parents": [ "af16ae693281dfc674d7fdfe0f1ed09812b9da53", "42a1ac4015fb8e3aa2ad011465ff101d0f03dfed" ], "author": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Tue Nov 16 15:56:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 16 15:56:00 2021 +0000" }, "message": "Migrate LocalePickerTest to Soong am: e2e39620a4 am: 0c6fa30a9a am: 42a1ac4015\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1861853\n\nChange-Id: Ic746eee36b447809b2bf52f2b3dcb27036bd17e8\n" }, { "commit": "42a1ac4015fb8e3aa2ad011465ff101d0f03dfed", "tree": "6be252c17127169b37841a53b41a7d28a096aadd", "parents": [ "af16ae693281dfc674d7fdfe0f1ed09812b9da53", "0c6fa30a9a078184b338d90a73f0192ff10dc18e" ], "author": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Tue Nov 16 15:42:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 16 15:42:22 2021 +0000" }, "message": "Migrate LocalePickerTest to Soong am: e2e39620a4 am: 0c6fa30a9a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1861853\n\nChange-Id: I8ca6f20c5516ef909c64212146c36ec0bde01dfc\n" }, { "commit": "0c6fa30a9a078184b338d90a73f0192ff10dc18e", "tree": "6be252c17127169b37841a53b41a7d28a096aadd", "parents": [ "af16ae693281dfc674d7fdfe0f1ed09812b9da53", "e2e39620a42370ba95eaa7e4566913b4e99d1d83" ], "author": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Tue Nov 16 15:24:55 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 16 15:24:55 2021 +0000" }, "message": "Migrate LocalePickerTest to Soong am: e2e39620a4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1861853\n\nChange-Id: Ib087e353ee2fd5b697af24ff926c19c5f559f723\n" }, { "commit": "e2e39620a42370ba95eaa7e4566913b4e99d1d83", "tree": "6be252c17127169b37841a53b41a7d28a096aadd", "parents": [ "af16ae693281dfc674d7fdfe0f1ed09812b9da53" ], "author": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Mon Oct 18 21:24:12 2021 +0000" }, "committer": { "name": "Trevor Radcliffe", "email": "tradical@google.com", "time": "Mon Nov 01 17:14:52 2021 +0000" }, "message": "Migrate LocalePickerTest to Soong\n\nFixes: 203454148\nTest: Ran tests\nChange-Id: I1be4ae8f70cd99aaa34a8750bf6165d186cc7635\n" }, { "commit": "a28604146def30993e7abc3a5c6574b0737020ac", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "04dce69b386bdf579767ed99f59a3bbaa211de70", "c84e272e99e3bfc87ae4763ebf31cb06ad7cefa2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:51:43 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:51:43 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: If7d95d41073c8d4f8c8416ebbb02a9135939db5a\n" }, { "commit": "04dce69b386bdf579767ed99f59a3bbaa211de70", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "6f4f9bbce0e0ac27874e8a9acd34ed8333d4ff2d", "81f221847b7988390732b1c319d34ba920e987a8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sun May 16 15:37:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun May 16 15:37:23 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155 am: e05ff22796 am: af16ae6932 am: 81f221847b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I127be7ecfdb7c1e2638c37dd65ef3bf8a7aeaa2e\n" }, { "commit": "81f221847b7988390732b1c319d34ba920e987a8", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "c1a05b5d483f817b5649799365381c33ec4d75af", "af16ae693281dfc674d7fdfe0f1ed09812b9da53" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 03:47:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 03:47:12 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155 am: e05ff22796 am: af16ae6932\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I61d6a0737503eeb5472664eb02d45b1b94f3ecf8\n" }, { "commit": "c84e272e99e3bfc87ae4763ebf31cb06ad7cefa2", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "c741bb6379900fa6b59a6a92af36ad1714e18ba9", "af16ae693281dfc674d7fdfe0f1ed09812b9da53" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 03:45:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 03:45:30 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155 am: e05ff22796 am: af16ae6932\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I0626e2db38590f32a36c3a38d6288be142e4e9a5\n" }, { "commit": "6f4f9bbce0e0ac27874e8a9acd34ed8333d4ff2d", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "cfd3ad42dae7a8ac21164f512bd0fb133e820116", "af16ae693281dfc674d7fdfe0f1ed09812b9da53" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 03:45:26 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 03:45:26 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155 am: e05ff22796 am: af16ae6932\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: If7e92f42b0dd387dc6f90579f5821f5ef89866ce\n" }, { "commit": "af16ae693281dfc674d7fdfe0f1ed09812b9da53", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "c1a05b5d483f817b5649799365381c33ec4d75af", "e05ff227961c2051adbf2aa371ba2cbc013dece1" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 03:25:41 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 03:25:41 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155 am: e05ff22796\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I466ba5e64a78914b5e411a1f7d09a29c7a799eeb\n" }, { "commit": "e05ff227961c2051adbf2aa371ba2cbc013dece1", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "fd308fc8750904d4755eb7ff4683ad6171cf5894", "76ee01f155a17e24475c88dafee8fb23837011b8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 03:05:47 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 03:05:47 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423 am: 76ee01f155\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I34e75ef685e111b0795f5e98db049baedf986301\n" }, { "commit": "76ee01f155a17e24475c88dafee8fb23837011b8", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "c9aa4a2a577d1488591ffb3270ff02b39aeab6e8", "5a1be594237378071e5d7e84eb838fe11a87831f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Sat Apr 24 02:42:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 24 02:42:54 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: 5a1be59423\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1684593\n\nChange-Id: I62fe3db6d72c3f07feee57e9cbb487eba244e0e1\n" }, { "commit": "5a1be594237378071e5d7e84eb838fe11a87831f", "tree": "fc9623505ca8e477585b6e349c3e30f71a266470", "parents": [ "c9aa4a2a577d1488591ffb3270ff02b39aeab6e8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Apr 23 16:12:16 2021 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Apr 23 16:12:16 2021 -0700" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n tests/Android.mk\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I893731320e4b45be8e9ed39b88be6ccb08cf7529\n" }, { "commit": "c741bb6379900fa6b59a6a92af36ad1714e18ba9", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "9251675e72f62aff38a12240912331292b99b7fc", "c1a05b5d483f817b5649799365381c33ec4d75af" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 12:19:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 12:19:49 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: c9aa4a2a57 -s ours am: fd308fc875 -s ours am: c1a05b5d48 -s ours\n\nam skip reason: Change-Id Ic471ee62731ed95439bb6748ee89546c58c5dfbb with SHA-1 3342435f15 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7b86af0a550609332fc59330cfe6c0bac20f3ac3\n" }, { "commit": "cfd3ad42dae7a8ac21164f512bd0fb133e820116", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "f9be738d68da5bba10395ffe1a4bacc8f631912a", "c1a05b5d483f817b5649799365381c33ec4d75af" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 12:19:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 12:19:49 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: c9aa4a2a57 -s ours am: fd308fc875 -s ours am: c1a05b5d48 -s ours\n\nam skip reason: Change-Id Ic471ee62731ed95439bb6748ee89546c58c5dfbb with SHA-1 3342435f15 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I9f1ae49b0f8ca0a7a40c5046678137dbc5955893\n" }, { "commit": "c1a05b5d483f817b5649799365381c33ec4d75af", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "9ca3577fe0b1f8024ab2b48720dab9d91e56d1ef", "fd308fc8750904d4755eb7ff4683ad6171cf5894" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 11:47:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 11:47:31 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: c9aa4a2a57 -s ours am: fd308fc875 -s ours\n\nam skip reason: Change-Id Ic471ee62731ed95439bb6748ee89546c58c5dfbb with SHA-1 3342435f15 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I14cbb60e6d894dccf44e9a2327dc4851e2fad15f\n" }, { "commit": "fd308fc8750904d4755eb7ff4683ad6171cf5894", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "4c6cbd6f90865332f00af9eb79b20f1b7312ae54", "c9aa4a2a577d1488591ffb3270ff02b39aeab6e8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 09:54:42 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 09:54:42 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: c9aa4a2a57 -s ours\n\nam skip reason: Change-Id Ic471ee62731ed95439bb6748ee89546c58c5dfbb with SHA-1 3342435f15 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I30af12b69d79b4e11131c6745af198c9ea3a30bc\n" }, { "commit": "c9aa4a2a577d1488591ffb3270ff02b39aeab6e8", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "4f995bd7c60b2d038ca2cc82a3ff2d2274096aff", "3342435f15e49da9afe9c8f0ce61f77f49fe6bcd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:29 2021 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:29 2021 -0800" }, "message": "Mark ab/7061308 as merged in stage.\n\nBug: 180401296\nMerged-In: Ic471ee62731ed95439bb6748ee89546c58c5dfbb\nChange-Id: If02e0ccfb3754dd7052812dfbeb11fd305049a1c\n" }, { "commit": "9251675e72f62aff38a12240912331292b99b7fc", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "3374fc0cae3d183176b290f0d746afd11813e138", "9ca3577fe0b1f8024ab2b48720dab9d91e56d1ef" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 20:11:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:11:30 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: e575b2a9b7 am: 4f995bd7c6 am: 4c6cbd6f90 am: 9ca3577fe0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1588988\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I67a05f81d1b5f86b7fd30b9edcd4d26b26a1af85\n" }, { "commit": "f9be738d68da5bba10395ffe1a4bacc8f631912a", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "3374fc0cae3d183176b290f0d746afd11813e138", "9ca3577fe0b1f8024ab2b48720dab9d91e56d1ef" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 20:08:11 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:08:11 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: e575b2a9b7 am: 4f995bd7c6 am: 4c6cbd6f90 am: 9ca3577fe0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1588988\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I75a03aba3d79691f6f80087e5004e8813927cced\n" }, { "commit": "9ca3577fe0b1f8024ab2b48720dab9d91e56d1ef", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "3374fc0cae3d183176b290f0d746afd11813e138", "4c6cbd6f90865332f00af9eb79b20f1b7312ae54" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 19:41:17 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 19:41:17 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: e575b2a9b7 am: 4f995bd7c6 am: 4c6cbd6f90\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1588988\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7365931611bdad3099af6ba16dfe67480d01a136\n" }, { "commit": "4c6cbd6f90865332f00af9eb79b20f1b7312ae54", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "3342435f15e49da9afe9c8f0ce61f77f49fe6bcd", "4f995bd7c60b2d038ca2cc82a3ff2d2274096aff" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 18:48:21 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 18:48:21 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: e575b2a9b7 am: 4f995bd7c6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1588988\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I7150c5b5e0cc8a8a092eb677ed4d3bdbfd8a661c\n" }, { "commit": "4f995bd7c60b2d038ca2cc82a3ff2d2274096aff", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "f53794cc691ed49fad8f2f7c936f719d5649a32f", "e575b2a9b7312386ae3a5e7ddcd83003a2e3f835" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 18:18:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 18:18:37 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker am: e575b2a9b7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/1588988\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I391f909efd27813827f4fa523e1680bb9686c0ba\n" }, { "commit": "e575b2a9b7312386ae3a5e7ddcd83003a2e3f835", "tree": "b09dcfc88258ee3ff184481ad4010ede9a29fe00", "parents": [ "f53794cc691ed49fad8f2f7c936f719d5649a32f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 15:34:27 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 15:34:27 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/localepicker\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n Android.bp\n tests/Android.mk\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I012a39d2338f1dae96e530b59698b8264761c8ee\n" } ], "next": "3374fc0cae3d183176b290f0d746afd11813e138" }