Mady Mellor
0be0c80a7c
Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
am: 0399987aa1
am: f55de6cdd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I522e268341ca3b7bab8cab7be5ca736ebaeb3c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 17:43:43 +00:00
Oli Thompson
1a883223d2
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
am: e86146d685
am: ca697c000a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: Ic85a04f5844fe373393a0811e07f553f83722827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 17:42:40 +00:00
Mady Mellor
f55de6cdd1
Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
am: 0399987aa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I9b9c6a097b60c2a08c5f69b6b3c02beb73bbeb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:59:18 +00:00
Oli Thompson
ca697c000a
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
am: e86146d685
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: Ifcde9f0a8fc75fc01909771df880f2b6ee70dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:58:49 +00:00
Mady Mellor
0399987aa1
Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I9ba9a9b9a7fb9ba79d5b3f28a4627f28937eb7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:17:46 +00:00
Oli Thompson
e86146d685
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: I7aa48065cbc087ff4135a93983e3b32b97dc6204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:16:59 +00:00
Mady Mellor
57406435cf
Merge "Update the colors for bubbles settings based on new spec" into udc-dev
2023-06-09 15:33:30 +00:00
Oli Thompson
01b382546e
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev
2023-06-09 15:31:17 +00:00
Oli Thompson
dcce8fa662
Fix emergency button not visible on pattern work challenge screen
...
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing
Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Zaiyue Xue
de151e008b
Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230
am: dff1bd58de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343
Change-Id: Id0a5a896ec8e8203204714249f4c9d756eb7cbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 11:46:16 +00:00
Zaiyue Xue
c19305590c
Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230
am: 44fcc61baf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343
Change-Id: I3364f31694053b7c19b99eb9d305f8b4cb9b225c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 11:43:55 +00:00
Zaiyue Xue
dff1bd58de
Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343
Change-Id: I07e697bb37a2c3655b7e5b6e5177c8d9d9059f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 11:01:47 +00:00
Zaiyue Xue
44fcc61baf
Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343
Change-Id: I25d159e01c517f4dbd0670dd1273c5da9b1ab21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 10:57:14 +00:00
Zaiyue Xue
65cb6ef230
Don't load battery entry name and icon in offline job to improve memory usage.
...
Risk: low, the name and icon will be always loaded again in the UI.
Bug: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-09 08:41:51 +00:00
Zoey Chen
db4bede383
Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev am: 593028ca32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23615216
Change-Id: I73c935ebf704c97e4b38621dd3675e8da42b02d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 06:11:34 +00:00
Zoey Chen
593028ca32
Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev
2023-06-09 05:57:19 +00:00
Treehugger Robot
de7585a864
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
am: 4b44c6632e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: Ib87dbf8f0302c8c81cdf0ae5bc455dea9c1044d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 05:48:47 +00:00
Treehugger Robot
cc4410e536
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
am: 34a254fc0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: I1f9fa9e219f1192945824aa4b07c9149e8a2876f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 05:42:42 +00:00
Treehugger Robot
4b44c6632e
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: I5b91a44f9c947d6686a28cb2acb2c41f58e8fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 05:02:25 +00:00
Treehugger Robot
34a254fc0c
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: Iea9c52ce4cfb37e4dc3df58a8117adb6b85e6c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 04:58:22 +00:00
Treehugger Robot
a99c52e160
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev
2023-06-09 04:29:16 +00:00
SongFerng Wang
f3359c7dc9
Merge "When config is changed, update the profile's visibility" into udc-d1-dev am: a210c84eb8
am: afc0ea3952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23599970
Change-Id: I6a7a197c4b9f46add44e2684605fcf5c53aa78b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 03:55:24 +00:00
SongFerng Wang
44e364584c
Merge "When config is changed, update the profile's visibility" into udc-d1-dev am: a210c84eb8
am: 517e3b8bf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23599970
Change-Id: I0f9cd49f8f557319e1e9d6f087d796923fccfe73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 03:49:18 +00:00
SongFerng Wang
afc0ea3952
Merge "When config is changed, update the profile's visibility" into udc-d1-dev am: a210c84eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23599970
Change-Id: I4969b792e002832c372f30e0f5e7694463b569cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 03:08:44 +00:00
SongFerng Wang
517e3b8bf4
Merge "When config is changed, update the profile's visibility" into udc-d1-dev am: a210c84eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23599970
Change-Id: Iefea29ab04aedbc0f0f06c1f9da489fd86bf9870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 03:04:47 +00:00
SongFerng Wang
a210c84eb8
Merge "When config is changed, update the profile's visibility" into udc-d1-dev
2023-06-09 02:26:16 +00:00
Treehugger Robot
5f60c90b82
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours am: 58fedeb053
-s ours am: ccbb133718
-s ours am: bd322e64df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I56b74a2380aafec513dcd1244b505e05828a06c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 23:31:09 +00:00
Bill Yi
123c382291
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours am: 4dbe6e87f2
-s ours am: 2afe393b43
-s ours am: 03f8992ecc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I6b9b22c6ead2b245e5358aad896975078da4383f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 23:30:53 +00:00
Treehugger Robot
9b12b50f1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours am: 6bf1d3b6cc
-s ours am: 0139435f36
-s ours am: 9aa61fb21a
-s ours am: c1a68f619f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I64b098eea8f84b9eaea6c8b2e4fc935d3fb555a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 23:30:33 +00:00
Bill Yi
1b5243d6e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours am: 4447361119
-s ours am: 9b90a5260a
-s ours am: 9185c4eb85
-s ours am: e718d877d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I93be81ed9b138cf020436d171be8c3d4944ba61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 23:30:15 +00:00
Treehugger Robot
bd322e64df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours am: 58fedeb053
-s ours am: ccbb133718
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I306cffb1efa2c8b98fe8b72a7ce070da5b88e49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 22:39:12 +00:00
Bill Yi
03f8992ecc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours am: 4dbe6e87f2
-s ours am: 2afe393b43
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: Ie79d61fa68c680f2623c243963c3995ae3037972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 22:38:56 +00:00
Treehugger Robot
c1a68f619f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours am: 6bf1d3b6cc
-s ours am: 0139435f36
-s ours am: 9aa61fb21a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I1cc218e7c2425d8b666bfc2abe63d34fb81d684d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 22:38:36 +00:00
Bill Yi
e718d877d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours am: 4447361119
-s ours am: 9b90a5260a
-s ours am: 9185c4eb85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I2b34635fac17beda9c384f032ddc147faad763a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 22:38:18 +00:00
Treehugger Robot
ccbb133718
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours am: 58fedeb053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: Ibf985f2de02b4109646b73554a08ced641753243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:55 +00:00
Bill Yi
2afe393b43
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours am: 4dbe6e87f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: Ib9d0cb3bda8aab108fe1f916694751a289efd780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:42 +00:00
Treehugger Robot
9aa61fb21a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours am: 6bf1d3b6cc
-s ours am: 0139435f36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I5e5fbd2b732abc0120fc364f7a9c89e334ee19b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:41:22 +00:00
Bill Yi
9185c4eb85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours am: 4447361119
-s ours am: 9b90a5260a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I10aeccb5883f01f7b95b6b496b0e00828ec5ae85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 21:40:59 +00:00
Treehugger Robot
58fedeb053
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours am: d422e6e895
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I2be65cd7ff57dbafdc6f687e2d18009bc4cfdc4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:54:19 +00:00
Bill Yi
4dbe6e87f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours am: 44b121b7c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I5fb2edeada2bcb5a84a78ab8c3ba30e08069d9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:54:02 +00:00
Treehugger Robot
0139435f36
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours am: 6bf1d3b6cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I771a03386f7a13325eb197e40a1558fe6fd50471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:53:43 +00:00
Bill Yi
9b90a5260a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours am: 4447361119
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: I6f4c2bb6bb7cc9db82229acc4bd117092a0394ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:53:26 +00:00
Mady Mellor
fb1e921bd9
Update the colors for bubbles settings based on new spec
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I28fa64f8d7b53419a57615bf3da4da7eff049674
2023-06-08 13:23:54 -07:00
Treehugger Robot
d422e6e895
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 17d8a837ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I09dec05a1a1ff91d9aa08ba1977d71c5411f822e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:13:57 +00:00
Bill Yi
44b121b7c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80c569b36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614632
Change-Id: I3ddc1ad1814db16b6a9ff11046cc1b58ee9038b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:13:39 +00:00
Treehugger Robot
6bf1d3b6cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: If22ae483107c3450ce9fa30d462f2530bb6e3da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:13:18 +00:00
Bill Yi
4447361119
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcde1cfde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631
Change-Id: Ia3ca6c734cd069412d0a98f9b188af3ac54eb18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 20:12:57 +00:00
Mady Mellor
6c25604e3e
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
am: 7605e122ac
am: e5aa469940
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: I5ac81c404d1e159076db63e4d2579eae06673d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 19:53:16 +00:00
Mady Mellor
b13f6f2751
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
am: 020007946a
am: 87c2c90482
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: If853a0027a4d4673e2439a886de1ac327bcac0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 19:50:25 +00:00
Mady Mellor
b1c6a59867
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
am: 7605e122ac
am: 1c4809812a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: Ia8df9e8f5f38eb131be80bacad294cb7a8353ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 19:46:35 +00:00