Yuri Lin
1d2a59d59c
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours am: 32e60479ca
-s ours am: d1c0e2151c
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I2661f108a341bf03c683f3859e36ae532263c4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:42:08 +00:00
Julia Reynolds
85e39e8997
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours am: fbcc4a9e52
-s ours am: 8e4337e37c
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I402f225ed9b2ae42d3b293e28a6ff42cd8d4ab53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:42:04 +00:00
Yuri Lin
d1c0e2151c
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours am: 32e60479ca
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I730cfb1b9593bcc4185d2effa5c474600e274bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:17:38 +00:00
Julia Reynolds
8e4337e37c
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours am: fbcc4a9e52
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I1ab75fd0ccf2a320ba0b3a0325273694eec7b2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:17:37 +00:00
Yuri Lin
32e60479ca
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I168125b60128b83e614aa6b19bdddfc093b00978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:51:30 +00:00
Julia Reynolds
fbcc4a9e52
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I11ec899513899e3dd48a434762745451077ab372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:51:28 +00:00
Yuri Lin
25aa1f617d
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I336ef4ab58d8c2cf31e857c49fd6ed88375796f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:26:09 +00:00
Julia Reynolds
812e171b1f
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I7b2266a5461935660c1eb59965d5b3ddfd5b54af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:26:05 +00:00
Yuri Lin
316cd96b28
Merge "Validate config activities with their rule owners" into rvc-dev
2022-08-11 01:32:32 +00:00
Julia Reynolds
43738f40fc
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours am: 8badd7a6a4
-s ours am: 7cb32cee36
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ib41bb9e855d6aa34190505510ff70e3bbf743ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 00:57:39 +00:00
Julia Reynolds
7cb32cee36
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours am: 8badd7a6a4
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: I00ddbb23e1ba526fb53716fa3a31cb40fd22bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 00:33:43 +00:00
Julia Reynolds
8badd7a6a4
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ic38c5cbf072f80ce3fe323dde9c960e36659f847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 23:34:12 +00:00
Julia Reynolds
8355374ddb
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ief88df7619d8fa00cdf9a9c7a64bdb422bdeab47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 23:01:01 +00:00
Julia Reynolds
8fada38f9e
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Id6c1135838a71faecce17ba959a2dcccb0a8cbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 22:20:44 +00:00
Julia Reynolds
25a49730f4
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours am: 42e9a0cf0d
-s ours am: 541f64ddfb
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: Ic674c116e818bdfd09393048a400a766a77f8c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:50:10 +00:00
Julia Reynolds
cc3edfd2c7
Validate config activities with their rule owners am: 65b18b5e69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: I844f7e5eeefced63bca9d9baf7b41d1f9b7ac277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:26:47 +00:00
Julia Reynolds
541f64ddfb
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours am: 42e9a0cf0d
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: I8c9a0036519c37474da516184f0b1a8503c389bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:26:13 +00:00
Julia Reynolds
42e9a0cf0d
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: Ida93487ec0bd4a6bf25b93a1dd990f9d10f23fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 20:53:46 +00:00
Julia Reynolds
59ca26589e
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:20:54 +00:00
Julia Reynolds
b161a3b850
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:20:22 +00:00
Julia Reynolds
65b18b5e69
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:19:14 +00:00
TreeHugger Robot
a28bac49f9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-30 21:51:15 +00:00
TreeHugger Robot
4fe2b9284d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-30 21:51:15 +00:00
Bill Yi
37a1fad359
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icf0a5a0e0f5c879e0dd77bd297cb0292ba19ef6e
2022-06-29 18:25:02 -07:00
Bill Yi
2cb8997657
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I47b4ad5429196a3a40323c5515b64b0889e60c67
2022-06-29 18:21:36 -07:00
Jason Chiu
846d0286a8
[DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow
...
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.
Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.
Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:21:34 +00:00
Bill Yi
e00a15d95f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
2022-06-18 19:47:16 -07:00
TreeHugger Robot
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00:00
Bill Yi
154b913f4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
TreeHugger Robot
725c53880a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
Raphael Kim
aa31e245ab
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:32:35 +00:00
Raphael Kim
8da96d69dd
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:00:18 +00:00
Raphael Kim
d6353487cf
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev
2022-06-05 01:54:28 +00:00
Bill Yi
106e52ca92
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Arc Wang
a80076e2f3
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I66eb46b7f25b9d3bc772ed945751858d503f9574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:26 +00:00
Tsung-Mao Fang
9c070af470
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I3aef9cb7abcb044840d5d56ab5c79679920529cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:25 +00:00
Arc Wang
4560b69963
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I19a2734d15b42047dcae7efad291d1ce51c633d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:24 +00:00
Arc Wang
1732408586
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I44ab9fffbeada73003e5876eeb83f2cc07c7928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:32 +00:00
Tsung-Mao Fang
2abeb254ea
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I3d7f8e78b6d9febcd06c7d84cc5c560b442ae294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:31 +00:00
Arc Wang
7c863fb69d
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Ie9bd953a9c613770fc12c121fdc155ee8b1aecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:30 +00:00
Arc Wang
ab3adbd4dd
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I6a43ef0a5d3be0ccea94ff04b6ef83bca00981b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:34 +00:00
Tsung-Mao Fang
2e3f8a30a1
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ied5f7df1a6f1e1f53a07dadcd828d8042a677c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:32 +00:00
Arc Wang
4129c273cc
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Ia6a7f76c885e08cbf388bbd912b08f481ae23575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:29 +00:00