)]}' { "log": [ { "commit": "a24fd83ae32682849519ecc14f9bf1a7589f25ff", "tree": "ac73183ac9aed832e022ac1285c47282e256819f", "parents": [ "9c8ea7e8d4b317547113f51445028f1829b74c3c", "0b1e539411dc10e7dcccbead7eb48c3fcf9b6466" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:47 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:47 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: If2f2aae1131535b8d7f7e9e3cc793daf38987e13\nChange-Id: Id7882eadb6b61841e236375d79c839dc562c4ae9\n" }, { "commit": "0b1e539411dc10e7dcccbead7eb48c3fcf9b6466", "tree": "ac73183ac9aed832e022ac1285c47282e256819f", "parents": [ "cd9da4bf317898feec5b00148e4305b03ec3aa7b", "5a8f525a7b805467300ce0897bd22d582d3857db" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:09 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:09 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: Id02e66534ad65504a8e8a03e843f7bb309f01f1a\nChange-Id: I057a8a0e569dc4937c38859a97a9fbd0b7d9c9b7\n" }, { "commit": "cd9da4bf317898feec5b00148e4305b03ec3aa7b", "tree": "64666831ff5fa4681a4da11e0a543e0f84aa12dd", "parents": [ "c8ee0a498b6b0828d64c9a70d0d73f3d62296632", "9c8ea7e8d4b317547113f51445028f1829b74c3c" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Dec 19 21:16:32 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 21:16:32 2024 -0800" }, "message": "Add janitors to the OWNERS file am: 9c8ea7e8d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3423992\n\nChange-Id: I92fc926c3adc29824ec0a62f91971242e3d6848f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c8ea7e8d4b317547113f51445028f1829b74c3c", "tree": "64666831ff5fa4681a4da11e0a543e0f84aa12dd", "parents": [ "49738d70ab7deb5a54801071fe8e8badbd181f5c" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:38:24 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:38:24 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I2cff673c994879e34d9b1b1ec7c8f4716ee5a575\n" }, { "commit": "c8ee0a498b6b0828d64c9a70d0d73f3d62296632", "tree": "cf6c5fc2a0b00784dd56c7179388030fbbd740a2", "parents": [ "9139562a71bd12a8eea85675eb77f80e514637b0", "49738d70ab7deb5a54801071fe8e8badbd181f5c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:29:55 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:29:55 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 49738d70ab -s ours\n\nam skip reason: Merged-In Iee49ffd94ac72ef063a8478735232829d06469d8 with SHA-1 b1da27d6a3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3413308\n\nChange-Id: Ib308226cdfaf0e480d758419e9f908caf7deb977\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "49738d70ab7deb5a54801071fe8e8badbd181f5c", "tree": "cf6c5fc2a0b00784dd56c7179388030fbbd740a2", "parents": [ "4509e40e65e9b2394b504ed5190a1ffa2583eadf", "9139562a71bd12a8eea85675eb77f80e514637b0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:13 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:13 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: Iee49ffd94ac72ef063a8478735232829d06469d8\nChange-Id: I9b72bc4f70d8e950d847f29c5174e63e2350601a\n" }, { "commit": "5a8f525a7b805467300ce0897bd22d582d3857db", "tree": "0513e86952c9abea47203a90f6fc8be8beb0dba2", "parents": [ "9af24bbf7764c2fbc5c7294fb2a37042dcce1b5a", "481d0d112ed4509516d2f59015028afb49bb2a0e" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Tue Nov 19 10:07:05 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 19 10:07:05 2024 +0000" }, "message": "Merge \"Add healthfitness to the list of apex_available.\" into main" }, { "commit": "9af24bbf7764c2fbc5c7294fb2a37042dcce1b5a", "tree": "4fa34f82d72d7f8d0830ae0780f7cf3ee1eef1ba", "parents": [ "5a08bc3d3806a4b71fa8c830c322ab7cd043d0f0" ], "author": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Mon Nov 18 03:08:22 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Mon Nov 18 03:08:22 2024 +0000" }, "message": "Import updated Android Setupdesign Library 695633919\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n\n- 695633919 [GlifExpressive] Support Wavy LinearProgressIndicator in progressBarMixin\n- 694370057 [GlifExpressive][Dialog style] Add SudGlifExpressiveDialogTheme for alert dialog.\n- 694319789 [GlifExpressive][Dialog style] Add material alert dialog style to glif expressive theme.\n- 693999183 [GlifExpressive] Adjust the padding top of content in expressive theme\n- 693666020 [GlifExpressive] update setupdesign library list item font size\n- 693601294 [GlifExpressive][Down button] Make the secondary button as gone when done button visible.\n- 693593417 [GlifExpressive][Button style] Add attributes into glif v1 ~ v4 to avoid if glif expressive flag enalbed but app uses glif v1 ~ v4 theme occurs exceptions.\n- 693254601 [GlifExpressive][Button style] Add an attribute sucFooterButtonTextLineSpacingExtra to make default line height of the button to 24dp.\n- 692852191 [SUW][GlifExpressive] Fix the list item group corner radius and margin.\n- 692840312 [GlifExpressive][Down button] Fix the footer bar background color when using RequireScrollMixi\n- 69282358 Fix back button margin incorrect when button size equal to icon size.\n- 692777833 [GlifExpressive] Update the default icon margin top for GlifExpressive\n- 692083074 Update the background color of the GlifExpressive theme to match the Material You spec.\n- 691236010 [GlifExpressive][Footerbar scrolling effect] Fix the issue that GlifRecyclerLayout has not switch footerbar background color immediately when user scrolling\n- 690901200 Programmatically inflate back button.\n- 690829432 [GlifExpressive][Button style] Add sucFooterBarButtonTextSize to adjust default text size as 16sp of footer ba\n- 690425262 [GlifExpressive][Button style] Update the default corner radius of footer button to 28dp\n- 690417064 [GlifExpressive] directly use TypedArray api to get the value of attributes.\n- 689581658 [GlifExpressive] Don\u0027t return dynamic color theme when glif expressive is enabled.\n- 688430995 [GlifExpressive] Add a new attribute to indicate whether the GlifExpressive style is applied.\n- 687947870 [GlifExpressive] Remove the attribute sucFullDynamicColor from GlifExpressive theme.\n- 687147012 Adjust back button margin top to center align to the icon size.\n\nPiperOrigin-RevId: 695633919\nChange-Id: Id02e66534ad65504a8e8a03e843f7bb309f01f1a\n" }, { "commit": "481d0d112ed4509516d2f59015028afb49bb2a0e", "tree": "52a0fe1033daacf021263f05636d698980925409", "parents": [ "5a08bc3d3806a4b71fa8c830c322ab7cd043d0f0" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Thu Nov 14 13:10:03 2024 +0000" }, "committer": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Thu Nov 14 13:11:12 2024 +0000" }, "message": "Add healthfitness to the list of apex_available.\n\nBug: 376085798\nTest: m\nFlag: NONE config change\nChange-Id: I413fbdf0df8fe0c5424454f970a67aa6c1600a7f\n" }, { "commit": "5a08bc3d3806a4b71fa8c830c322ab7cd043d0f0", "tree": "31b9e4b8422a84beaf05223d97cd19113e60c4fd", "parents": [ "b2551f03f158d4372116ae6c8858b808916d91f6", "9139562a71bd12a8eea85675eb77f80e514637b0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 14 00:08:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 00:08:28 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 9139562a71 -s ours\n\nam skip reason: Merged-In Iee49ffd94ac72ef063a8478735232829d06469d8 with SHA-1 b1da27d6a3 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/30284981\n\nChange-Id: I7c9a3350d66f192cef8efecfe9cc52b116f63e62\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9139562a71bd12a8eea85675eb77f80e514637b0", "tree": "cf6c5fc2a0b00784dd56c7179388030fbbd740a2", "parents": [ "3fce60ddd3dd5dbd91224edf0cffbd704dfeed7d", "b1da27d6a34ebb9817a0520a7f80a24df9556620" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:24 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:24 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: Iee49ffd94ac72ef063a8478735232829d06469d8\nChange-Id: Ia9d5f80c49bf7187f807fc33e91d3088de512513\n" }, { "commit": "b2551f03f158d4372116ae6c8858b808916d91f6", "tree": "31b9e4b8422a84beaf05223d97cd19113e60c4fd", "parents": [ "5d43b95e570be414ddc299511a5ac7a4898f5b23" ], "author": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Wed Oct 23 08:20:34 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Wed Oct 23 12:56:01 2024 +0000" }, "message": "Update floating back button to use Button instead of MaterialButton\n\nThis is to fix a crash bug for short term when glif expressive flag is enabled and the lock screen page would not apply material theme.\n\nChange-Id: I879796c92ce8edb072b50c3de60abb7b56f2c159\nTest: manual test\nBug: 375098738\n" }, { "commit": "5d43b95e570be414ddc299511a5ac7a4898f5b23", "tree": "281a4324ce57d80ea6f2d4a520bee64618bbda7e", "parents": [ "3be301f4adf1f14a34d3b6c972824331275368bc" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Fri Oct 18 01:22:30 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Fri Oct 18 03:52:01 2024 +0000" }, "message": "Import updated Android Setupdesign Library 687113300\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 687113300 Remove the keyword from setupdesign and setupcompat\n - 686771508 Update header title style for expressive theme\n - 686759989 Add debug log to getSuwDefaultTheme().\n - 684809252 Fix backbutton icon can\u0027t display on AiAi page.\n - 682281915 Fix the issue when adapter used by other background.\n\nPiperOrigin-RevId: 687113300\nChange-Id: I4e167a19ee9beb1933d8d16869d4be0d12785bfd\n" }, { "commit": "3be301f4adf1f14a34d3b6c972824331275368bc", "tree": "020825034b15f52d57fe70666e89099dcb8ce5b6", "parents": [ "b1da27d6a34ebb9817a0520a7f80a24df9556620" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Thu Oct 03 09:55:26 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Mon Oct 07 12:49:37 2024 +0000" }, "message": "Import updated Android Setupdesign Library 681794050\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 681794050 [BC25] let list item do not affected by activity margin s...\n - 681363274 Fix back button doesn\u0027t apply the partner customization\n - 681309180 [BC25][Down Button] Fix the issue that the button width i...\n - 680925959 Make header frame and content frame not focusable because...\n - 680440592 [BC25] Add sucFooterBarButtonFontWeight attribute and set...\n - 680424174 Update the button to M3 style\n - 679484464 [BC25] Enable full dynamic color for GlifExpressive themes\n - 679466839 [BC25] update the icon margin top\n - 679417629 [BC25] Update the padding of the footer button in the Gli...\n - 679057456 Fix the wrong mapping for the large screen portrait layout.\n - 679056758 Apply item group corner radius\n - 679038463 [BC25] Remove duplicated attribute from Glif expressive t...\n - 679015292 [BC25] remove using the attribute sucFullDynamicColor as ...\n - 678639833 Create aosp list item in glif expressive theme.\n - 678504644 Add back button to the loading layout under https://sourc...\n - 678474263 [BC25] Apply the button width to expressive style if scro...\n - 678467915 [BC25] Don\u0027t apply dynamic color theme when BC25 is enabl...\n - 678125098 Automated g4 rollback of changelist 668881572.\n - 676766572 Modify the icon gravity of expressive theme style to cent...\n - 676729276 [2/2]Add dimensions for glif expressive theme\n - 675854504 [BC25] Update the min height of the button in the footer ...\n - 675803166 [BC25] Add margin to footer button in expressive style\n - 675773860 Fix the elevation of IntrinsicSizeFrameLayout when the la...\n - 675057454 [BC25] Rename isGlifExpressiveEnabled to shouldApplyGlifE...\n - 675014022 Add back button to v35 layout\n - 674997096 [BC25] Add sucFooterBarMinHeight attribute to adjust the ...\n - 674986819 [BC25] Update Glif expressive footer bar padding\n - 673768321 Add expressive layouts for GlifLayout, GlifListLayout, Gl...\n - 673750749 [BC25] Add footer button text color for Glif expressive s...\n - 673748466 Update naming\n - 673281309 [BC25] Add down arrow icon to the require scroll button.\n - 673198001 Fix color conflict.\n - 673184790 [BC25] Apply styles for the down button in RequireScrollM...\n - 672875693 Remove the version for dimension to reduce the apk size a...\n - 672827429 create the floating back button mixin\n - 672742239 [BC25] Apply footer button font family to Roboto in the G...\n - 672421738 [BC25] Apply new Item style for BC 25\n - 672361102 [BC25] Update primary button color for Glif expressive st...\n - 671647157 [BC25] Migrates font family to the expressive section to ...\n - 670443929 [1/2]Add dimensions for glif expressive theme\n - 670129350 Automated g4 rollback of changelist 670097217.\n - 670100224 Cloned from CL 669182456 by \u0027hg patch\u0027.\n - 670100152 Cloned from CL 669182310 by \u0027hg patch\u0027.\n - 670097947 Create glif expressive layout for glif loading layout.\n - 670097217 Prevent tapjacking in setup design layout.\n - 670091263 Prevent tapjacking in lottie loading layout.\n - 670089181 Cloned from CL 669182390 by \u0027hg patch\u0027.\n - 670019030 [BC25] Update Glif expressive footer button font family t...\n - 669232124 [BC25] Return Glif Expressive theme from getSuwDefaultThe...\n - 669221148 [BC25] Add an attribute to set footer bar background color.\n (And 34 more changes)\n\nPiperOrigin-RevId: 681794050\nBug: 344740755\nChange-Id: I305855a7386e8c8294d1e9756465b8f3c16c3fd0\n" }, { "commit": "b1da27d6a34ebb9817a0520a7f80a24df9556620", "tree": "cf6c5fc2a0b00784dd56c7179388030fbbd740a2", "parents": [ "9fa5867b12ddff1a69f87721b493b2bbe9edfab5" ], "author": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Thu Sep 12 01:17:03 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Thu Sep 12 01:54:31 2024 +0000" }, "message": "Fix the elevation of IntrinsicSizeFrameLayout when the layout is MATCH_PARENT\n\nThe IntrinsicSizeFrameLayout is shown in the child screen that is not a full screen. Even though the IntrinsicSizeFrameLayout is set MATCH_PARENT to be a fullscreen. The edge line would be shown on IntrinsicSizeFrameLayout.\n\nFix the issue that the elevation of IntrinsicSizeFrameLayout is not reset to show the edge line when the layout params are set MATCH_PARENT and it isn\u0027t the real fullscreen.\n\n\nBug: 332639317\nTest: manual test\nChange-Id: Iee49ffd94ac72ef063a8478735232829d06469d8\n" }, { "commit": "9fa5867b12ddff1a69f87721b493b2bbe9edfab5", "tree": "9bdee2d5b166b00dfb78729912044f9bd515f24c", "parents": [ "cb74a023828abf4049ccca0611be2b75f4cdef5d", "3fce60ddd3dd5dbd91224edf0cffbd704dfeed7d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 04:43:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 04:43:25 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 4509e40e65 -s ours am: 3fce60ddd3 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3258023\n\nChange-Id: I026b0e3821648b3eaaf409dec074e96ba1d5bfd2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3fce60ddd3dd5dbd91224edf0cffbd704dfeed7d", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "232db154870dcf1fc51dd5d3cc1a62ea1c236e83", "4509e40e65e9b2394b504ed5190a1ffa2583eadf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:36:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:36:03 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 4509e40e65 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3258023\n\nChange-Id: If6db5f5844d114a9e504382073de187c99658ea5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4509e40e65e9b2394b504ed5190a1ffa2583eadf", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "c1117bf1749e036bc51b94b7e4e4aba1fd21f533", "232db154870dcf1fc51dd5d3cc1a62ea1c236e83" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:49 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:02:49 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I46302d5af424e666e2f666478afe9adf2b480b65\nChange-Id: I852672ce9f2f3fe21a467423fb2e73cc090daef2\n" }, { "commit": "cb74a023828abf4049ccca0611be2b75f4cdef5d", "tree": "9bdee2d5b166b00dfb78729912044f9bd515f24c", "parents": [ "e537f9e00490094819f8d841ac5a5eaf9cbbd685" ], "author": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Mon Aug 12 03:51:28 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Mon Aug 12 03:52:59 2024 +0000" }, "message": "Remove maxLines from sudGlifHeader of material style.\n\nThis is to allow the header to be as long as it needs to be.\n\nbefore: https://hsv.googleplex.com/5939371243995136\nAfter: https://hsv.googleplex.com/4866291599933440\n\nChange-Id: I2025f6d5e0f5584ddcad64862299a1dc8b4dcca2\nTest: manual\nBug: 359063026\nBug: 333611959\n" }, { "commit": "e537f9e00490094819f8d841ac5a5eaf9cbbd685", "tree": "9cc07ce18a05881169c696283c64e7f7ea3299b8", "parents": [ "310da0fbb9844f1e213e24218a1bb31d0f5b306b" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Thu Jul 25 16:01:39 2024 +0000" }, "committer": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Fri Jul 26 01:28:01 2024 +0000" }, "message": "Import updated Android Setupdesign Library 655973050\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 655973050 [SetupDesign] Fix the issue that the header is not shown ...\n\nBug: 346720623\nPiperOrigin-RevId: 655973050\nChange-Id: Ie31f4974897300d263d5a96d6f8f3705f1f09f40\n" }, { "commit": "310da0fbb9844f1e213e24218a1bb31d0f5b306b", "tree": "60f4c43315b7e686a2111605519d78e5daa03026", "parents": [ "6b7876f68affa028f91c6180f9ad52d990389953" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Mon Jul 15 01:56:19 2024 +0000" }, "committer": { "name": "Pasty Chang", "email": "pastychang@google.com", "time": "Fri Jul 19 05:18:11 2024 +0000" }, "message": "Import updated Android Setupdesign Library 652325545\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 652325545 Add log to check if the activity is embedded\n - 648277118 Add TRANSITION_FADE_THROUGH to TransitionHelper.Transitio...\n - 642822831 Fix accessibility issue for GoogleServicesExpandableSwitc...\n\nPiperOrigin-RevId: 652325545\nChange-Id: If143caeb38a20ee9c450eba1fb893068b65bc692\n" }, { "commit": "6b7876f68affa028f91c6180f9ad52d990389953", "tree": "60a671be902ba327711c144ccc14306910d1e569", "parents": [ "ed5dc3e4c6a55a22b57c264a64836804befed425", "232db154870dcf1fc51dd5d3cc1a62ea1c236e83" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Tue Jul 16 07:41:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 16 07:41:21 2024 +0000" }, "message": "[automerger skipped] setupdesign minsdk bump from 19 to 21 am: c1117bf174 -s ours am: 232db15487 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3146161\n\nChange-Id: I1b538d5e6129462d6d206da9db5ea453db01a070\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "232db154870dcf1fc51dd5d3cc1a62ea1c236e83", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "1ee03c84d620cef6b200b4ebdb203e00643c6a41", "c1117bf1749e036bc51b94b7e4e4aba1fd21f533" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Tue Jul 16 07:30:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 16 07:30:03 2024 +0000" }, "message": "[automerger skipped] setupdesign minsdk bump from 19 to 21 am: c1117bf174 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3146161\n\nChange-Id: I1c42cd71ad9a92d5cfc5e1d462705e82b640754d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ed5dc3e4c6a55a22b57c264a64836804befed425", "tree": "60a671be902ba327711c144ccc14306910d1e569", "parents": [ "4cdf2c33453c17220f05a82a20aeddca66682893", "c299d6a3c68ddd26a85c3b259495dfd3e19df105" ], "author": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Fri Jul 12 03:20:13 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 12 03:20:13 2024 +0000" }, "message": "Merge \"Import updated Android Setupdesign Library 638161259\" into main" }, { "commit": "c1117bf1749e036bc51b94b7e4e4aba1fd21f533", "tree": "46488478a08deaa19c1d86db10cf8f4603ea9468", "parents": [ "c6ef8d0881684c2c9dd397ae2d7df5de14822f15" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Jun 26 07:19:01 2024 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Jun 26 09:24:37 2024 +0000" }, "message": "setupdesign minsdk bump from 19 to 21\n\nBug: 340711546\nChange-Id: I4630e5f3f021eea3a21b1a935212b8dcee173b17\nMerged-In: I46302d5af424e666e2f666478afe9adf2b480b65\nTest: Treehugger\n" }, { "commit": "4cdf2c33453c17220f05a82a20aeddca66682893", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "43b55e2c7fb8ef1dafb19481867d123ae51ed087", "1ee03c84d620cef6b200b4ebdb203e00643c6a41" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 20:40:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 20:40:38 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1ee03c84d6 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/27908804\n\nChange-Id: I60c985ccb2a739a3c51893748aecc679a1237962\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ee03c84d620cef6b200b4ebdb203e00643c6a41", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "81b00e0e56ee86d41ba3f9d88c9f48e000be240d", "10ad6927db9fe7e8206d25727e8e8a38c4400097" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:35 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:35 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I46302d5af424e666e2f666478afe9adf2b480b65\nChange-Id: I90e70b22bcdb31860ef14f74a7df2994b288a1f5\n" }, { "commit": "43b55e2c7fb8ef1dafb19481867d123ae51ed087", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "1843a7ee969ef2d696a9d69ccb90af24d3f767d9", "81b00e0e56ee86d41ba3f9d88c9f48e000be240d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:44 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: c6ef8d0881 -s ours am: 81b00e0e56 -s ours\n\nam skip reason: Merged-In I44b3b98907f981f2a436d2021f28e40d8ef70c70 with SHA-1 b480e36a23 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3131959\n\nChange-Id: I074f0a054b65e328ce5a39362ceb43ac84da1335\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1843a7ee969ef2d696a9d69ccb90af24d3f767d9", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "10ad6927db9fe7e8206d25727e8e8a38c4400097", "8a0bee1ab1904ea8498c2b07ea3f10b3a9cf6f4a" ], "author": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Tue Jun 18 04:57:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 04:57:38 2024 +0000" }, "message": "[automerger skipped] Bump minSdk to 21 am: 8a0bee1ab1 -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 38e44bf54e is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/27838377\n\nChange-Id: I37b92717aa376bcd64c2f23424a8ed85fe6d40d1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "81b00e0e56ee86d41ba3f9d88c9f48e000be240d", "tree": "97b86d6fed187222d0a3350ba3e60794a55f5be3", "parents": [ "8a0bee1ab1904ea8498c2b07ea3f10b3a9cf6f4a", "c6ef8d0881684c2c9dd397ae2d7df5de14822f15" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:59 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: c6ef8d0881 -s ours\n\nam skip reason: Merged-In I44b3b98907f981f2a436d2021f28e40d8ef70c70 with SHA-1 b480e36a23 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3131959\n\nChange-Id: I579c7d36850ba12dc2b91c6765e653a48103e7a1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8a0bee1ab1904ea8498c2b07ea3f10b3a9cf6f4a", "tree": "97b86d6fed187222d0a3350ba3e60794a55f5be3", "parents": [ "b480e36a23230504a99ef8dbddb728b234321abb" ], "author": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Tue Apr 30 15:50:45 2024 +0800" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Fri Jun 14 04:00:53 2024 +0000" }, "message": "Bump minSdk to 21\n\nBug: 322508920\nBug: 329997430\nTest: presubmit\nChange-Id: I46302d5af424e666e2f666478afe9adf2b480b65\nMerged-In: I46302d5af424e666e2f666478afe9adf2b480b65\n(cherry picked from commit 6cd52a5c9cb9385767732eb3bf2d3ac9ecd6e5c7)\n" }, { "commit": "c6ef8d0881684c2c9dd397ae2d7df5de14822f15", "tree": "4420dd649e6d6f9d02eff3627762eddea910f6ed", "parents": [ "4634dac90e3c09a78c2fcdfcb16ab9cb16265527", "b480e36a23230504a99ef8dbddb728b234321abb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:02 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:02 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I44b3b98907f981f2a436d2021f28e40d8ef70c70\nChange-Id: I2e00a239f630046a1201ca2fceac5b6dce1e1c3d\n" }, { "commit": "c299d6a3c68ddd26a85c3b259495dfd3e19df105", "tree": "60a671be902ba327711c144ccc14306910d1e569", "parents": [ "10ad6927db9fe7e8206d25727e8e8a38c4400097" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Wed May 29 06:26:44 2024 +0000" }, "committer": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Wed Jun 12 10:41:56 2024 +0000" }, "message": "Import updated Android Setupdesign Library 638161259\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 638161259 Set the attribute textDirection to locale in SudDescripti...\n - 635309141 Add log to debug the GlifLoadingLayout does not display t...\n - 631376319 [SetupLibrary] Update switch track off color.\n - 625509490 Fix external/setupdesign for use_resource_processor: true\n - 620147179 [two-pane] Refer `_two_pane` layout resources directly\n\nPiperOrigin-RevId: 638161259\nChange-Id: Ib68689f4b1247502df8ba04349b0656407d0acc8\n" }, { "commit": "10ad6927db9fe7e8206d25727e8e8a38c4400097", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "9e36af964491365461cdc322f1cbe9c98d2f1fa1", "b480e36a23230504a99ef8dbddb728b234321abb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 22 23:41:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 22 23:41:03 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: b480e36a23 -s ours\n\nam skip reason: Merged-In I79098b8d7793718a19dfbde161f1ab35d5f2d95b with SHA-1 df2d4de85b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/27274117\n\nChange-Id: Ib96907bf1f171a541f285ec633e26164048043ca\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b480e36a23230504a99ef8dbddb728b234321abb", "tree": "4420dd649e6d6f9d02eff3627762eddea910f6ed", "parents": [ "a075cd19364781b1c45e057d0888650397452970", "df2d4de85bdab985d72aecde5cde24fb0b5445e1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:21 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:21 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I79098b8d7793718a19dfbde161f1ab35d5f2d95b\nChange-Id: I44b3b98907f981f2a436d2021f28e40d8ef70c70\n" }, { "commit": "9e36af964491365461cdc322f1cbe9c98d2f1fa1", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "6cd52a5c9cb9385767732eb3bf2d3ac9ecd6e5c7", "38e44bf54e6069672ecf99c0f799c5dedc547872" ], "author": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Mon May 06 05:46:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 06 05:46:52 2024 +0000" }, "message": "[automerger skipped] Bump minSdk to 21 am: 38e44bf54e -s ours\n\nam skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 6cd52a5c9c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/27187588\n\nChange-Id: Ia642d89016b229421441d6cc18f250ecbf2b7151\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38e44bf54e6069672ecf99c0f799c5dedc547872", "tree": "469d1a31592459a567b83d59ba299ea24385a2a0", "parents": [ "accd386aa14563ff3d3cddc64b07493c7536b4e7" ], "author": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Tue Apr 30 15:50:45 2024 +0800" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu May 02 09:03:10 2024 +0000" }, "message": "Bump minSdk to 21\n\nBug: 322508920\nBug: 329997430\nTest: presubmit\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cd52a5c9cb9385767732eb3bf2d3ac9ecd6e5c7)\nMerged-In: I46302d5af424e666e2f666478afe9adf2b480b65\nChange-Id: I46302d5af424e666e2f666478afe9adf2b480b65\n" }, { "commit": "6cd52a5c9cb9385767732eb3bf2d3ac9ecd6e5c7", "tree": "cc2bb2e8308b01131a31ed0c54417eea0b8bbcff", "parents": [ "8eea19a2177e075ca47b17cf5e3a9686ef69e11c" ], "author": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Tue Apr 30 15:50:45 2024 +0800" }, "committer": { "name": "Charles Chen", "email": "charlesccchen@google.com", "time": "Tue Apr 30 15:50:45 2024 +0800" }, "message": "Bump minSdk to 21\n\nBug: 322508920\nBug: 329997430\nTest: presubmit\nChange-Id: I46302d5af424e666e2f666478afe9adf2b480b65\n" }, { "commit": "8eea19a2177e075ca47b17cf5e3a9686ef69e11c", "tree": "790f4b897e2d835b5230e14d810ccf7729bf6a5a", "parents": [ "9abe2530ae9cf436c05e5846a27e885eda6428a5" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 12 10:24:19 2024 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 12 10:25:22 2024 -0700" }, "message": "Fix external/setupdesign for use_resource_processor: true\n\nReference resources using the package name of the android_library\nthat contains them.\n\nBug: 294256649\nTest: m javac-check -k\nChange-Id: Ie13312135697fa4908ee447f948dc7a56f48f4e2\n" }, { "commit": "9abe2530ae9cf436c05e5846a27e885eda6428a5", "tree": "f7ac7d7defce338f708290489e06e396567a3279", "parents": [ "3a2a9e876f696d1dac03d3f46a662ebc6397a6ff", "accd386aa14563ff3d3cddc64b07493c7536b4e7" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Fri Mar 29 06:55:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 29 06:55:58 2024 +0000" }, "message": "Import updated Android Setupdesign Library 616085475 am: accd386aa1\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/26617930\n\nChange-Id: If32c720782b906173e0bd2338f9237fb3a1c011b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "accd386aa14563ff3d3cddc64b07493c7536b4e7", "tree": "f84d2ef74db71b63337a314bce783b8efa2de148", "parents": [ "df2d4de85bdab985d72aecde5cde24fb0b5445e1" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Fri Mar 15 19:29:59 2024 +0800" }, "committer": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Fri Mar 22 10:27:13 2024 +0000" }, "message": "Import updated Android Setupdesign Library 616085475\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nBug: 323771329\nTest: mm\n\nIncluded changes:\n - 616085475 [two-pane] Fix the icon and title place in wrong side in ...\n - 614970798 Optimize the header text for largest display/font size\n - 613400702 [Seamless] Adjust dynamic color and add outline to toggle...\n\nPiperOrigin-RevId: 616085475\nChange-Id: I0119a985ba4b39097200865167923a70be43bb55\n" }, { "commit": "3a2a9e876f696d1dac03d3f46a662ebc6397a6ff", "tree": "53286b30d9155d586471aeb566cb750990343d94", "parents": [ "ca762fbb9c22238457892c459b853c7e9cc075c3", "a075cd19364781b1c45e057d0888650397452970" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:37 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 4634dac90e -s ours am: a075cd1936 -s ours\n\nam skip reason: Merged-In I7249956f2eca6a5ab79346ccd8f8ad6cf9db09e4 with SHA-1 f04fb8b590 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2989883\n\nChange-Id: Ifb415f7ec70b72aff5d361d08b91a0c416151413\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a075cd19364781b1c45e057d0888650397452970", "tree": "0cc02e20450303b00ea57e6f086c85692ee37a36", "parents": [ "f04fb8b59062e8c9279140d698796bf2927ffa2c", "4634dac90e3c09a78c2fcdfcb16ab9cb16265527" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:12 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 4634dac90e -s ours\n\nam skip reason: Merged-In I7249956f2eca6a5ab79346ccd8f8ad6cf9db09e4 with SHA-1 f04fb8b590 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2989883\n\nChange-Id: I5192b2409a9353ab957d96967007f26ca0bcb166\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4634dac90e3c09a78c2fcdfcb16ab9cb16265527", "tree": "0cc02e20450303b00ea57e6f086c85692ee37a36", "parents": [ "b07899ff0ae407963d9c745cf97c994ca06f8c29", "f04fb8b59062e8c9279140d698796bf2927ffa2c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:56 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:56 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: I7249956f2eca6a5ab79346ccd8f8ad6cf9db09e4\nChange-Id: I3d659edd0de44da47ce7a169f762a0749e0e26e3\n" }, { "commit": "ca762fbb9c22238457892c459b853c7e9cc075c3", "tree": "53286b30d9155d586471aeb566cb750990343d94", "parents": [ "df2d4de85bdab985d72aecde5cde24fb0b5445e1" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Tue Mar 05 14:03:17 2024 +0800" }, "committer": { "name": "Cyril Lee", "email": "cyrillee@google.com", "time": "Tue Mar 05 09:22:22 2024 +0000" }, "message": "Import updated Android Setupdesign Library 612703306\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 612703306 [two-pane] Avoid the two-pane layout resource be striped ...\n\nBug: 323080102\nPiperOrigin-RevId: 612703306\nChange-Id: I088783e207015d21e938a958452e31bec8fd7489\n" }, { "commit": "df2d4de85bdab985d72aecde5cde24fb0b5445e1", "tree": "4420dd649e6d6f9d02eff3627762eddea910f6ed", "parents": [ "1afa71f17f0a71c32209d7b6199b6cb708ca8650" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Mon Mar 04 18:30:47 2024 +0800" }, "committer": { "name": "Cyril", "email": "cyrillee@google.com", "time": "Mon Mar 04 20:06:35 2024 +0800" }, "message": "Import updated Android Setupdesign Library 612372664\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 612372664 [twopane] Update GlifLoadingLayout to support force two p...\n - 612280996 [twopane] Update GlifXLayout to support force two panel s...\n - 611475964 Fix test.layout_files_have_filterTouchesWhenObscured test...\n - 611375909 [twopane] Update GlifLayout to support force two panel st...\n - 609631096 Adding resource id for IntrinsicSizeFrameLayout\n\nPiperOrigin-RevId: 612372664\nChange-Id: I79098b8d7793718a19dfbde161f1ab35d5f2d95b\n" }, { "commit": "1afa71f17f0a71c32209d7b6199b6cb708ca8650", "tree": "364a85ebd566b37c0ef7061eb6c4f62bdb6b35f0", "parents": [ "35eb0b453908be51bbda6c5a320ac7b69e70aae6", "f04fb8b59062e8c9279140d698796bf2927ffa2c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:03:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:03:26 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: f04fb8b590 -s ours\n\nam skip reason: Merged-In Iabd997ede6c6d9fa1d02dc304c4fa5ac794b0dc0 with SHA-1 5d2225db83 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25972892\n\nChange-Id: I8fc48e626843ecd877d45899a099c290094ed9df\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f04fb8b59062e8c9279140d698796bf2927ffa2c", "tree": "0cc02e20450303b00ea57e6f086c85692ee37a36", "parents": [ "a96927339172ff97c2ee5c6da0f3e9a3bdd9c7fb", "dea361889e229d870aed048590e6acb35938182c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:00 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:00 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: Iabd997ede6c6d9fa1d02dc304c4fa5ac794b0dc0\nChange-Id: I7249956f2eca6a5ab79346ccd8f8ad6cf9db09e4\n" }, { "commit": "35eb0b453908be51bbda6c5a320ac7b69e70aae6", "tree": "364a85ebd566b37c0ef7061eb6c4f62bdb6b35f0", "parents": [ "c801517087d55e07b43d71964de28458d8a8f41c", "317a41009427623fbb04486ef48b90d247a372e4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 11 19:28:10 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 11 19:28:10 2024 +0000" }, "message": "Merge \"Baseline NewApi issues\" into main" }, { "commit": "317a41009427623fbb04486ef48b90d247a372e4", "tree": "bf2fe838f0edadb9a457a4430686b1af52a42a45", "parents": [ "eee8bfcc43044c023598ccfb8dc41dffbb5e1fc2" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Jan 10 12:30:35 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Jan 10 12:30:35 2024 -0800" }, "message": "Baseline NewApi issues\n\nNewApi is a lint check that you don\u0027t call framework methods that were\nintroduced in versions later than your min_sdk_version. We want to\nmake this an error, so we\u0027re baselineing all existing issues.\n\nThis cl was generated automatically, by taking all the NewApi issues\nfrom the reference baselines, and all the non-NewApi issues from the\nexisting checked in baselines.\n\nBug: 268261262\nTest: Presubmits\nChange-Id: If46c6baa01de2f2b4d28d099f04c4a353131a1e3\n" }, { "commit": "c801517087d55e07b43d71964de28458d8a8f41c", "tree": "01666d8fc8cf81a8c485fc6e000cbdcded2ddb58", "parents": [ "eee8bfcc43044c023598ccfb8dc41dffbb5e1fc2" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Mon Jan 08 01:01:58 2024 +0000" }, "committer": { "name": "Alex Li", "email": "alexylli@google.com", "time": "Wed Jan 10 03:00:16 2024 +0000" }, "message": "Import updated Android Setupdesign Library 596439791\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nTest: mm\n\nIncluded changes:\n - 596439791 [SetupLibrary] Add indicator for HeaderRecyclerView to ma...\n - 593932577 [SetupLibrary] Make if there have partnerConfig override ...\n\nBug:316079216\n\nPiperOrigin-RevId: 596439791\nChange-Id: I9d57f03cb4b4ef15ae9f36e322807a16a142a5e2\n" }, { "commit": "eee8bfcc43044c023598ccfb8dc41dffbb5e1fc2", "tree": "0cc02e20450303b00ea57e6f086c85692ee37a36", "parents": [ "dea361889e229d870aed048590e6acb35938182c", "1e97c4ddaa8370bbb94643f0d363c5b6c0f81d46" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 23:05:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 23:05:44 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: b07899ff0a am: a969273391 am: 1e97c4ddaa\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2886467\n\nChange-Id: I66501c0cfd34c4830b5cc66064fbf9bed4870abf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e97c4ddaa8370bbb94643f0d363c5b6c0f81d46", "tree": "e465a2eb9fa131221638ce7dd7633329089e526b", "parents": [ "f6aa9a2d6e9ec5697a69ea9fc1961e2e1ffc0af5", "a96927339172ff97c2ee5c6da0f3e9a3bdd9c7fb" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 22:32:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 22:32:20 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: b07899ff0a am: a969273391\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2886467\n\nChange-Id: Ibc8869abc028be2290a26d459fd87f618ef144b7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a96927339172ff97c2ee5c6da0f3e9a3bdd9c7fb", "tree": "e465a2eb9fa131221638ce7dd7633329089e526b", "parents": [ "5cc368b0e1dd7d05871ed9b1e3407d82ce1acca9", "b07899ff0ae407963d9c745cf97c994ca06f8c29" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 22:02:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 22:02:09 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: b07899ff0a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2886467\n\nChange-Id: I214dc0c7fd6d52b60ec2ad66692eb58e70311959\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b07899ff0ae407963d9c745cf97c994ca06f8c29", "tree": "e465a2eb9fa131221638ce7dd7633329089e526b", "parents": [ "b454fe7937082619a4c673dd883f489b83c5a7d3" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:02 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:02 2023 -0800" }, "message": "List baseline_filename on modules that are implititly using it\n\nlintable modules currently pick up files named \"lint-baseline.xml\" to use as the\nlint baseline implicitly. This is confusing because you could end up using the\nbaseline files in more modules than intended. Lint also has a feature where it\nrequests you remove unnecessary findings from the baseline file, so something\ncould be necessary for one module, but unnecessary for another that accidentally\npicked up the baseline.\n\nWe\u0027re removing the implicit detection of the baseline file, which requires\nall modules using it to list the baseline file explicitly.\n\nBug: 272769514\nTest: Presubmits\nChange-Id: Ia0fd37552da2f660b89a95833384253d4acd5ef5\n" }, { "commit": "dea361889e229d870aed048590e6acb35938182c", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "0343caa274002715d28f0b4761c52163e6a1a3ba", "f6aa9a2d6e9ec5697a69ea9fc1961e2e1ffc0af5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:57:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:57:43 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: b454fe7937 -s ours am: 5cc368b0e1 -s ours am: f6aa9a2d6e -s ours\n\nam skip reason: Merged-In If9d9e69ac0255ffb503b9e2a067f7be81ed6c139 with SHA-1 fe93969af2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2863577\n\nChange-Id: I82097ae9ee48612d6b363718175ef834467a546f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f6aa9a2d6e9ec5697a69ea9fc1961e2e1ffc0af5", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "b713a27255fb8e5e901fedc4528326c130cfeef0", "5cc368b0e1dd7d05871ed9b1e3407d82ce1acca9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:02:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:02:30 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: b454fe7937 -s ours am: 5cc368b0e1 -s ours\n\nam skip reason: Merged-In If9d9e69ac0255ffb503b9e2a067f7be81ed6c139 with SHA-1 fe93969af2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2863577\n\nChange-Id: I2d4e3e6a4d134f5e3bca294de98cc622e19c4b4a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5cc368b0e1dd7d05871ed9b1e3407d82ce1acca9", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "fe93969af2d6c96f953af718a1a1c7f29dc979e5", "b454fe7937082619a4c673dd883f489b83c5a7d3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:41 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: b454fe7937 -s ours\n\nam skip reason: Merged-In If9d9e69ac0255ffb503b9e2a067f7be81ed6c139 with SHA-1 fe93969af2 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2863577\n\nChange-Id: I6acdc1ad8987ef5a77024c76ee5ebcd238b8a60c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b454fe7937082619a4c673dd883f489b83c5a7d3", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "a6a7cc0368bbd3950804d66f33996d110705fbd2", "fe93969af2d6c96f953af718a1a1c7f29dc979e5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:08 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:08 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: If9d9e69ac0255ffb503b9e2a067f7be81ed6c139\nBug: 315507370\nChange-Id: Ie657cdd67c85b40cfbd7ca02e4ab7065331bb9c9\n" }, { "commit": "0343caa274002715d28f0b4761c52163e6a1a3ba", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "f575d582c9e784edceb04a42e11d530cb04375da", "b713a27255fb8e5e901fedc4528326c130cfeef0" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 23:35:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 23:35:00 2023 +0000" }, "message": "Merge \"update setup design to min sdk 19\" into main am: a6a7cc0368 am: fe93969af2 am: b713a27255\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851367\n\nChange-Id: Ie6a0fa5c2ec5dcd0252842f1fc51ae463ee90565\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f575d582c9e784edceb04a42e11d530cb04375da", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "2319769bc3f88e50bc96aa92ee405b23a95d0699", "f218b01eb5a87bd90ed0b8098f09f5c94f0dbc99" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 23:34:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 23:34:54 2023 +0000" }, "message": "[automerger skipped] update lottie_loading_layout to minsdk19 am: 22af737d99 am: 3b63fbd8e6 am: f218b01eb5 -s ours\n\nam skip reason: Merged-In I61cd78999675fdcf62f807fdde0e3ac25d8654b9 with SHA-1 26bd34d1a3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851366\n\nChange-Id: I8a7b8b4e432eb164550e894fa7463b44dcef9651\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b713a27255fb8e5e901fedc4528326c130cfeef0", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "f218b01eb5a87bd90ed0b8098f09f5c94f0dbc99", "fe93969af2d6c96f953af718a1a1c7f29dc979e5" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 23:25:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 23:25:57 2023 +0000" }, "message": "Merge \"update setup design to min sdk 19\" into main am: a6a7cc0368 am: fe93969af2\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851367\n\nChange-Id: I56eed366f38433e1faffeab21b7b45a3c26884e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f218b01eb5a87bd90ed0b8098f09f5c94f0dbc99", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "e8d97cafc93ecebc934a3a20adf7b4abac3f1107", "3b63fbd8e62c3bd755f71d5d7782fd69514fcd37" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 23:25:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 23:25:54 2023 +0000" }, "message": "update lottie_loading_layout to minsdk19 am: 22af737d99 am: 3b63fbd8e6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851366\n\nChange-Id: Ic79c8614e282c32a29bbf54931fd15e25d9c3939\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe93969af2d6c96f953af718a1a1c7f29dc979e5", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "3b63fbd8e62c3bd755f71d5d7782fd69514fcd37", "a6a7cc0368bbd3950804d66f33996d110705fbd2" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 22:51:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 22:51:00 2023 +0000" }, "message": "Merge \"update setup design to min sdk 19\" into main am: a6a7cc0368\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851367\n\nChange-Id: If9d9e69ac0255ffb503b9e2a067f7be81ed6c139\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b63fbd8e62c3bd755f71d5d7782fd69514fcd37", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "f9d4d1d9b5b06d15e4d78b15bc060ba7313da2d4", "22af737d99984e51c802cf3ce8d9a0cce5240f60" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 22:50:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 22:50:50 2023 +0000" }, "message": "update lottie_loading_layout to minsdk19 am: 22af737d99\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2851366\n\nChange-Id: Iaf10b642846f5167c655c24733c71cc736b2074b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6a7cc0368bbd3950804d66f33996d110705fbd2", "tree": "a0deb93fac7f273b1096fe161b05494f4a55bdcb", "parents": [ "22af737d99984e51c802cf3ce8d9a0cce5240f60", "c99c5a08b65e5d6449eeb1b54baf80cda498290e" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Dec 07 22:08:01 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 07 22:08:01 2023 +0000" }, "message": "Merge \"update setup design to min sdk 19\" into main" }, { "commit": "2319769bc3f88e50bc96aa92ee405b23a95d0699", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "a445f5f0f7ed8da1b7eda2a371b2a455ccccef94", "e8d97cafc93ecebc934a3a20adf7b4abac3f1107" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 22:41:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 22:41:03 2023 +0000" }, "message": "[automerger skipped] Merge \"lottie_loading_layout bumped minsdk version to 19\" into aosp-main-future am: f9d4d1d9b5 am: e8d97cafc9 -s ours\n\nam skip reason: Merged-In I61cd78999675fdcf62f807fdde0e3ac25d8654b9 with SHA-1 26bd34d1a3 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25563573\n\nChange-Id: Ie97116b2dd0aed4e83ee9b5941ee4626bb3d377d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a445f5f0f7ed8da1b7eda2a371b2a455ccccef94", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "1396defde6499a41d337036f324006721c0566ca", "3b3e7939edaf6a72597786ab3d27717f73c07ef7" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 22:40:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 22:40:49 2023 +0000" }, "message": "setup design bumped minsdk version 19 am: a5de304c1d am: 3b3e7939ed\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25563450\n\nChange-Id: I76598893e66cc10a7c884e8c323bceb51f443775\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e8d97cafc93ecebc934a3a20adf7b4abac3f1107", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "3b3e7939edaf6a72597786ab3d27717f73c07ef7", "f9d4d1d9b5b06d15e4d78b15bc060ba7313da2d4" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 22:22:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 22:22:04 2023 +0000" }, "message": "Merge \"lottie_loading_layout bumped minsdk version to 19\" into aosp-main-future am: f9d4d1d9b5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25563573\n\nChange-Id: I6e0805b5840e93c239e399a1d15fb382984447af\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b3e7939edaf6a72597786ab3d27717f73c07ef7", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "cddc2f58d22387403f41f26ec13d0e24579db51b", "a5de304c1d95a03d5192afab8791b5b70452d712" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 22:21:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 22:21:53 2023 +0000" }, "message": "setup design bumped minsdk version 19 am: a5de304c1d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25563450\n\nChange-Id: Iae76c37d53e9e5d1f47da3d47fdb49d2d6835052\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9d4d1d9b5b06d15e4d78b15bc060ba7313da2d4", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "a5de304c1d95a03d5192afab8791b5b70452d712", "5d2225db83ed10385aba19cf8b0c8dea726728d6" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 21:01:48 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 06 21:01:48 2023 +0000" }, "message": "Merge \"lottie_loading_layout bumped minsdk version to 19\" into aosp-main-future" }, { "commit": "a5de304c1d95a03d5192afab8791b5b70452d712", "tree": "62efcbc92d65acf88e4f7920f94a972cff0c1163", "parents": [ "817f18088ad5fd6c1b3c3a29073981fcc408d157" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Tue Nov 14 19:09:00 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 00:06:26 2023 +0000" }, "message": "setup design bumped minsdk version 19\n\nChange-Id: Id5e413b2d1577bd0a59d56d11927091621cd8b48\n(cherry picked from commit bf9ae68c7fbe68a78bb6d9c58b058e99102931d6)\n" }, { "commit": "5d2225db83ed10385aba19cf8b0c8dea726728d6", "tree": "81bad4b1fcdefeaae3a5b632a4e16929f4a2afde", "parents": [ "817f18088ad5fd6c1b3c3a29073981fcc408d157" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 16 05:51:49 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Dec 06 00:04:55 2023 +0000" }, "message": "lottie_loading_layout bumped minsdk version to 19\n\nChange-Id: Iabd997ede6c6d9fa1d02dc304c4fa5ac794b0dc0\nMerged-In: I61cd78999675fdcf62f807fdde0e3ac25d8654b9\nBug: 307291543\n(cherry picked from commit f011d28256c1a29a17d0276b5bd0a636b564ed24)\n" }, { "commit": "c99c5a08b65e5d6449eeb1b54baf80cda498290e", "tree": "da16830a0c8a1976123f3f66811ca94b43b5358e", "parents": [ "fb7798afcb8b495a673400fe3730b6c02c00d545" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Tue Nov 14 19:09:00 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Nov 29 00:58:21 2023 +0000" }, "message": "update setup design to min sdk 19\n\nChange-Id: Id5e413b2d1577bd0a59d56d11927091621cd8b48\nTest: Treehugger\n" }, { "commit": "22af737d99984e51c802cf3ce8d9a0cce5240f60", "tree": "f09fb3fdf861b0e7bd53bab1cef776f6f98c0aad", "parents": [ "fb7798afcb8b495a673400fe3730b6c02c00d545" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 16 05:51:49 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Nov 29 00:57:02 2023 +0000" }, "message": "update lottie_loading_layout to minsdk19\n\nChange-Id: Iabd997ede6c6d9fa1d02dc304c4fa5ac794b0dc0\nMerged-In: I61cd78999675fdcf62f807fdde0e3ac25d8654b9\nBug: 307291543\nBug: 310639352\nTest: Treehugger\n" }, { "commit": "1396defde6499a41d337036f324006721c0566ca", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "04182ca80b31f633d7e1f716fbea36d4f2ae0a6a", "cddc2f58d22387403f41f26ec13d0e24579db51b" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 23 01:01:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 23 01:01:40 2023 +0000" }, "message": "[automerger skipped] Merge \"update lottie_loading_layout to minsdk19\" into udc-dev-plus-aosp am: a806a322cd am: cddc2f58d2 -s ours\n\nam skip reason: Merged-In I61cd78999675fdcf62f807fdde0e3ac25d8654b9 with SHA-1 26bd34d1a3 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25387450\n\nChange-Id: I57a8349da1579935af8eaac4ca6f507654b61e7c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "04182ca80b31f633d7e1f716fbea36d4f2ae0a6a", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "aae1b458dbb46927153202ff4a325c00ae95d9eb", "2df6a249dc06f2a068fec52be553c3ae0aa5eb58" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 23 01:01:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 23 01:01:25 2023 +0000" }, "message": "update setup design to min sdk 19 am: bf9ae68c7f am: 2df6a249dc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25373133\n\nChange-Id: I1e5d47bf4bc379469f9ba1253db8de249b7bbe80\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cddc2f58d22387403f41f26ec13d0e24579db51b", "tree": "a686dbe049dd9304a041a66c0b8ee5fb88484551", "parents": [ "2df6a249dc06f2a068fec52be553c3ae0aa5eb58", "a806a322cdaeb6adf32355220809397db6abbc10" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 23 00:37:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 23 00:37:15 2023 +0000" }, "message": "Merge \"update lottie_loading_layout to minsdk19\" into udc-dev-plus-aosp am: a806a322cd\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25387450\n\nChange-Id: I370e3c2dfca36255d5c4e8ce9fd7f04f22e6bc83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2df6a249dc06f2a068fec52be553c3ae0aa5eb58", "tree": "62efcbc92d65acf88e4f7920f94a972cff0c1163", "parents": [ "162ab670d1e2ec1590d312139515af084bc2dc49", "bf9ae68c7fbe68a78bb6d9c58b058e99102931d6" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 23 00:37:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 23 00:37:02 2023 +0000" }, "message": "update setup design to min sdk 19 am: bf9ae68c7f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25373133\n\nChange-Id: Ib436abd8080ae57818953cc45f124b4f767d07e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a806a322cdaeb6adf32355220809397db6abbc10", "tree": "a0deb93fac7f273b1096fe161b05494f4a55bdcb", "parents": [ "bf9ae68c7fbe68a78bb6d9c58b058e99102931d6", "f011d28256c1a29a17d0276b5bd0a636b564ed24" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Nov 22 17:57:17 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 22 17:57:17 2023 +0000" }, "message": "Merge \"update lottie_loading_layout to minsdk19\" into udc-dev-plus-aosp" }, { "commit": "f011d28256c1a29a17d0276b5bd0a636b564ed24", "tree": "f09fb3fdf861b0e7bd53bab1cef776f6f98c0aad", "parents": [ "0130c30263bc5d77cb0a9220fcab3385b2b1abd6" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 16 05:51:49 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Thu Nov 16 17:56:16 2023 +0000" }, "message": "update lottie_loading_layout to minsdk19\n\nChange-Id: Iabd997ede6c6d9fa1d02dc304c4fa5ac794b0dc0\nMerged-In: I61cd78999675fdcf62f807fdde0e3ac25d8654b9\nBug: 307291543\n" }, { "commit": "bf9ae68c7fbe68a78bb6d9c58b058e99102931d6", "tree": "da16830a0c8a1976123f3f66811ca94b43b5358e", "parents": [ "0130c30263bc5d77cb0a9220fcab3385b2b1abd6" ], "author": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Tue Nov 14 19:09:00 2023 +0000" }, "committer": { "name": "Anvesh Renikindi", "email": "renikindi@google.com", "time": "Wed Nov 15 22:36:03 2023 +0000" }, "message": "update setup design to min sdk 19\n\nChange-Id: Id5e413b2d1577bd0a59d56d11927091621cd8b48\n" }, { "commit": "aae1b458dbb46927153202ff4a325c00ae95d9eb", "tree": "a81f77eb405d77360eabea539d7e04d427349ea7", "parents": [ "9da0714e832b606fdf2ae53e1619a1804724c5ed" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Wed Nov 01 06:38:21 2023 +0000" }, "committer": { "name": "Alex Li", "email": "alexylli@google.com", "time": "Thu Nov 09 07:49:53 2023 +0000" }, "message": "Import updated Android Setupdesign Library 578413139\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nBug:278492246\nTest: mm\n\nIncluded changes:\n - 578413139 [SetupLibrary] Make if there have partnerConfig override ...\n - 577767834 Change min sdk to 23 for lottie loading layout\n - 572013340 Update Android Lint to http://ab/10672018 (version ID 31....\n\nPiperOrigin-RevId: 578413139\nChange-Id: Ia6e568f145c63fc5d50cc4eb87a701192122f95d\n" }, { "commit": "9da0714e832b606fdf2ae53e1619a1804724c5ed", "tree": "042582e2006997e274aacdfed318b5354912100c", "parents": [ "e691c488c925e2fff476afa4e5e22cebcda7c766", "26bd34d1a35b6edc899645f0daba23a39450a316" ], "author": { "name": "Pihuei Wang", "email": "pihuei@google.com", "time": "Mon Oct 30 06:19:28 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 30 06:19:28 2023 +0000" }, "message": "Merge \"Import updated Android Setupdesign Library 571249030\" into main" }, { "commit": "26bd34d1a35b6edc899645f0daba23a39450a316", "tree": "042582e2006997e274aacdfed318b5354912100c", "parents": [ "549874ea475799d119e2b362936904aca7d01c5c" ], "author": { "name": "Setup Wizard Team", "email": "android-setup-team-eng@google.com", "time": "Fri Oct 06 15:15:03 2023 +0800" }, "committer": { "name": "Pihuei Wang", "email": "pihuei@google.com", "time": "Mon Oct 30 02:37:38 2023 +0000" }, "message": "Import updated Android Setupdesign Library 571249030\n\nCopied from google3/third_party/java_src/android_libs/setupdesign\n\nBug: 303336953\nTest: mm\n\nIncluded changes:\n - 571249030 Fix external/setupdesign for use_resource_processor: true\n - 567212193 [Cosmic Ray] Remove StartActivity and StartActivityForRes...\n - 566521975 Automated g4 rollback of changelist 566362468.\n - 566362468 Automated g4 rollback of changelist 566242836.\n - 566242836 Decoupling the activity start and transition\n - 564894091 [Cosmic Ray] Remove Activity options for Cosmic Ray\n - 562965479 [DesignLibrary] Bump up the sdk to the latest version.\n - 561595584 [DesignLibrary] Upgrade the min sdk version to 19 due to ...\n\nPiperOrigin-RevId: 571249030\nChange-Id: I61cd78999675fdcf62f807fdde0e3ac25d8654b9\n" }, { "commit": "e691c488c925e2fff476afa4e5e22cebcda7c766", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "549874ea475799d119e2b362936904aca7d01c5c", "162ab670d1e2ec1590d312139515af084bc2dc49" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:54:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:54:43 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 817f18088a -s ours am: 162ab670d1 -s ours\n\nam skip reason: Merged-In If0f830281b5a9c4345d45a4c9862df2a504c54e0 with SHA-1 46f49ee241 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25090924\n\nChange-Id: Ib9d885619be130bf43a96937b372100ed1724242\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "162ab670d1e2ec1590d312139515af084bc2dc49", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "46f49ee24189bc1ed00fb5fa68b5f364f5eeff7e", "817f18088ad5fd6c1b3c3a29073981fcc408d157" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:47:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:57 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: 817f18088a -s ours\n\nam skip reason: Merged-In If0f830281b5a9c4345d45a4c9862df2a504c54e0 with SHA-1 46f49ee241 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/25090924\n\nChange-Id: I677ec7564b7907eb361eca67464f4c9058a60dfb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "817f18088ad5fd6c1b3c3a29073981fcc408d157", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "dd85b0e28c5a8c66a55d71897b3b52c7ee7807f0", "46f49ee24189bc1ed00fb5fa68b5f364f5eeff7e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:31 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:31 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: If0f830281b5a9c4345d45a4c9862df2a504c54e0\nChange-Id: I7655970a9537159ffcf0e1654459662aea37b323\n" }, { "commit": "549874ea475799d119e2b362936904aca7d01c5c", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "8a119580e380932d76de2f032def459d1eafc24c", "46f49ee24189bc1ed00fb5fa68b5f364f5eeff7e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:28 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fb7798afcb -s ours am: dd85b0e28c -s ours am: 0130c30263 -s ours am: 6803f782fa -s ours am: 46f49ee241 -s ours\n\nam skip reason: Merged-In I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93 with SHA-1 ad88e339de is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2774979\n\nChange-Id: I743c96434e0c8130456a5647d39e67b88097a92c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "46f49ee24189bc1ed00fb5fa68b5f364f5eeff7e", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "950fa1cce535aa93d9f167a88952e96b2008ac8c", "6803f782fa1ab021987baee3bc0e6bbfb93238cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:57 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fb7798afcb -s ours am: dd85b0e28c -s ours am: 0130c30263 -s ours am: 6803f782fa -s ours\n\nam skip reason: Merged-In I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93 with SHA-1 ad88e339de is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2774979\n\nChange-Id: If0f830281b5a9c4345d45a4c9862df2a504c54e0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6803f782fa1ab021987baee3bc0e6bbfb93238cd", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "2853987a8b82eec7a6b7308bed170a7d6c04142c", "0130c30263bc5d77cb0a9220fcab3385b2b1abd6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:07 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fb7798afcb -s ours am: dd85b0e28c -s ours am: 0130c30263 -s ours\n\nam skip reason: Merged-In I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93 with SHA-1 ad88e339de is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2774979\n\nChange-Id: Iff2704e94ffa0bc4d9907ca18a90e3935cf8c202\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0130c30263bc5d77cb0a9220fcab3385b2b1abd6", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "a6cf20804c0cc007b832509b6c45b3e642e53363", "dd85b0e28c5a8c66a55d71897b3b52c7ee7807f0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:30 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fb7798afcb -s ours am: dd85b0e28c -s ours\n\nam skip reason: Merged-In I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93 with SHA-1 ad88e339de is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2774979\n\nChange-Id: I7be3be545a7f42b4f9a2c0a0b55cad7e3aa58bf6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd85b0e28c5a8c66a55d71897b3b52c7ee7807f0", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "ecc2f29c9659de84ecba2f684c0894efa47819ef", "fb7798afcb8b495a673400fe3730b6c02c00d545" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:26 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: fb7798afcb -s ours\n\nam skip reason: Merged-In I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93 with SHA-1 ad88e339de is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2774979\n\nChange-Id: I993f69d7de71298951632f3a8bc431fbee97cf36\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fb7798afcb8b495a673400fe3730b6c02c00d545", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "ad88e339ded9fe704368ef512c8e5e013b3e8659", "ecc2f29c9659de84ecba2f684c0894efa47819ef" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:39 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:39:39 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93\nChange-Id: Ibd889b66d9c30dc44444e7efaff370375ca5e0a7\n" }, { "commit": "8a119580e380932d76de2f032def459d1eafc24c", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "84a00fbe66e9e0b6c4b87c6b491aa34a55de3686", "950fa1cce535aa93d9f167a88952e96b2008ac8c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 05 20:40:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 20:40:15 2023 +0000" }, "message": "Fix external/setupdesign for use_resource_processor: true am: ad88e339de am: ecc2f29c96 am: a6cf20804c am: 2853987a8b am: 950fa1cce5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770\n\nChange-Id: I932075fb62067f5936b31f1579a8f73b409eda3b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "950fa1cce535aa93d9f167a88952e96b2008ac8c", "tree": "c5a0106be6ec4980282fd9e7302f53ca39a08d65", "parents": [ "990f3e0874f674a191e0edf8a6332cae16763dba", "2853987a8b82eec7a6b7308bed170a7d6c04142c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 05 19:38:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 19:38:45 2023 +0000" }, "message": "Fix external/setupdesign for use_resource_processor: true am: ad88e339de am: ecc2f29c96 am: a6cf20804c am: 2853987a8b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770\n\nChange-Id: I18235795f6c2dce8abea5f95da78bfb789bbd3c5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2853987a8b82eec7a6b7308bed170a7d6c04142c", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "b0065cbf85dc15c6c71a07001119b6f39ec755f7", "a6cf20804c0cc007b832509b6c45b3e642e53363" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 05 19:04:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 19:04:55 2023 +0000" }, "message": "Fix external/setupdesign for use_resource_processor: true am: ad88e339de am: ecc2f29c96 am: a6cf20804c\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770\n\nChange-Id: I751dd24dc3c1f45f99ebba1406cce4f5d7e807fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6cf20804c0cc007b832509b6c45b3e642e53363", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "a78276d840965fd4aa92ec89d073cd43f3f2a09c", "ecc2f29c9659de84ecba2f684c0894efa47819ef" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 05 18:15:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 18:15:14 2023 +0000" }, "message": "Fix external/setupdesign for use_resource_processor: true am: ad88e339de am: ecc2f29c96\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770\n\nChange-Id: Ic4799950b6540c3137f0ca482558484c0d92dfef\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ecc2f29c9659de84ecba2f684c0894efa47819ef", "tree": "da3b4d7cdcf184f41fb9d883cfc792f3d1919b68", "parents": [ "2083657e24214a44d3c950f4d58a0ac24a8743fe", "ad88e339ded9fe704368ef512c8e5e013b3e8659" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 05 17:42:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 05 17:42:58 2023 +0000" }, "message": "Fix external/setupdesign for use_resource_processor: true am: ad88e339de\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2767770\n\nChange-Id: I296a6df2e1384079993a3bff34908a1f163a4b1f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad88e339ded9fe704368ef512c8e5e013b3e8659", "tree": "304c65c57b53ffa66f626b9108ea6ff9f75727d2", "parents": [ "2b1feb3c2fe419fa81e6330fd479c42f2fd8549e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Sep 25 15:21:05 2023 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Oct 04 09:57:15 2023 -0700" }, "message": "Fix external/setupdesign for use_resource_processor: true\n\nUse a manifest with a unique package name for each android_library,\nand reference resources with the package name specified in the manifest\nof the library that contains the resources.\n\nBug: 294256649\nTest: m javac-check\nChange-Id: I7e5b5f41e42f19eb3afa31e80f6bea1fc72f1e93\n" } ], "next": "84a00fbe66e9e0b6c4b87c6b491aa34a55de3686" }