Commit Graph

110885 Commits

Author SHA1 Message Date
Arc Wang
5df4e288bb [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I0ee8652395833285c5b164595bd3c1cce1cccd99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:27:08 +00:00
Tsung-Mao Fang
df830ac3fa [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I620b63a431b517ca34a0814ecedfc1620dee1856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:27:05 +00:00
Bill Yi
ab4d718925 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours am: d2c3ae9589 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: I49e8d1d674b4990c7a490e6f745ac03774f82b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:22:23 +00:00
Raphael Kim
f053bf659b [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours am: ff7f705e3e -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I8c0dcdfa249b890033657513789e159652d56107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:22:19 +00:00
Raphael Kim
dd69b4fb22 [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours am: e4a98fbbb7 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I5d6dbace72c89ea64c4e149fb52df0b7ec0a5ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:22:15 +00:00
Bill Yi
ef452d047e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours am: addc1c03f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: Ibda95f174da17fbc22c488e299c999474154e6a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:22:12 +00:00
Bill Yi
9c3313d79b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours am: 187b9a2630 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: Ida78db77c1a86bf9a51e01df9b7b36699d4398a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:58 +00:00
Arc Wang
72437e7d60 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: Ib4059d90a482880b618cca375e430aab50939583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:48 +00:00
Tsung-Mao Fang
52a571f239 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I7fbf142979d4b836047c7bf7c06e5b067f880634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:47 +00:00
Bill Yi
1f41f63573 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours am: ee26947d53 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: If28602d56c68242ceb3b3abbb8d75fb50e00c209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:45 +00:00
Arc Wang
1b012c577a [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I46a57a4c06c367fe44dad58f954c28e6be299114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:35 +00:00
Tsung-Mao Fang
f5ab97c8cd [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I977c1950fc375f28048ff0b4b1a96386ddea5c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:21:34 +00:00
Arc Wang
cb82328fac Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: I537b89e15e11438da0c19671795c911645eee790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:37 +00:00
Tsung-Mao Fang
99a7a61ba9 [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: I97954b12a7385a4cd5caabb19c030744ae6895f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:36 +00:00
Arc Wang
58880a0bef [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598

Change-Id: Id5b31b30de1883d7d673fc0de60419fca7a22e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:35 +00:00
Arc Wang
98cd637460 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: Ic1c5318e59c28f384a7959fe43ccc7fd16e8c0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:31 +00:00
Tsung-Mao Fang
3e42752f57 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours am: 00cdaa2259 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I5f6069eb0fe88f05d46e314c90a1e26e91e07f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:26 +00:00
Arc Wang
b6ab2f9307 [automerger skipped] Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev am: 27f9995beb -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 40fbcf333f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: Ic51930188fbebd5f693d990cabdee3d624a09399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:09 +00:00
Tsung-Mao Fang
d029dbf666 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 90968c8437 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704656

Change-Id: I223e91b985da7ec7b918c96a9cb46c0bc8631cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:05 +00:00
Raphael Kim
b8c14b8752 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours am: ff7f705e3e -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I12b9d85398e088f62cff4f0423b5de053751c736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:59 +00:00
Arc Wang
db800e96b9 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: Icfeee8189c8284f1f7daea85d4d58d35f55cad32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:59 +00:00
Tsung-Mao Fang
00cdaa2259 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: I0e5e408b38d91db502fa6c35a3d937b3a23e64bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:58 +00:00
Raphael Kim
f11acd30cf [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours am: e4a98fbbb7 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I65aa5194249aa626926e2d9b77d64ce244b4970d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:19:55 +00:00
Raphael Kim
ff7f705e3e [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: I430522ee976449cdcb470e6a510985b8c3732495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:43 +00:00
Raphael Kim
e4a98fbbb7 [automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647

Change-Id: Id56f80e2f6003aa084ce9c8607fada6cfbe72a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:40 +00:00
Arc Wang
b9ccfd6534 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I30b7a6be2715493a516157ae181ff46c2f0f4946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:11 +00:00
Tsung-Mao Fang
797861776d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662

Change-Id: I1cc602c563e1e2d7a118551b1fceb0dfa30a646b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:08 +00:00
Arc Wang
3e93b4e4fc [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I5896853422386124cf9e88bb85699410f776a1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:06 +00:00
Tsung-Mao Fang
709a5df6f3 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661

Change-Id: I7a0f53768055d1b5350d91fc3c53203caacdd5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:18:02 +00:00
Automerger Merge Worker
2530ab9f18 Merge changes from topic "am-58716186f5b942dba5730c9eff837985" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours
2022-06-04 00:13:00 +00:00
Bill Yi
d2c3ae9589 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: I4f40b7b7d705ea404754a15b8e4e095f06a55b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:12:15 +00:00
Bill Yi
dd8c6768fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: Ie56d8fa2b401f6a8264a029a0b1e07082e10e100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:12:04 +00:00
Bill Yi
785f9c689d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: a99136a41f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: Ib661b99ebe08f17b0a4639f15332bc6cf1ba5b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:12:04 +00:00
Bill Yi
addc1c03f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: Iddfb406f0907729950ee118796da5ca8698eda64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:12:04 +00:00
Bill Yi
038842bd3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 6c8413c9d2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: Ib29f5ede5f654fc710cf561dd95859bc40abf323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:54 +00:00
Bill Yi
a4f418e952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: I8035fb614c21257d0bb47cc92f6821d06434194d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:54 +00:00
Bill Yi
187b9a2630 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: I7b67bf4fd539f8703edf78ca7f5dbb741a50fd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:50 +00:00
Bill Yi
628068265b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: d032393702 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: I217301729fcf25bd4575e0454add345acf6e11c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:48 +00:00
Bill Yi
db0f24bb60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 2ae7a0db93 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: Ifd52eef88231b9f4f3a3336b059d76b3c40f0cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:40 +00:00
Bill Yi
8302f5fa9d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: f3067d00ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719945

Change-Id: I9ee07127aa3955ce5def34a3518d58c66f0bfc65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:40 +00:00
Bill Yi
d9c0deb0b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: I85c3e28397146be8cef1a038a8839f4ca2a3406e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:39 +00:00
Bill Yi
ee26947d53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: Ib40e6726c039744531f1ae93ba33c59f3c009be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:38 +00:00
Bill Yi
ba8ad5e3af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: Ied0d66866aca1d2f4938b0f7960e1d4dcdc5a602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:28 +00:00
Bill Yi
131adc8bf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: c3d89fb945 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: I7e56e6595871a7b4e86f10bfab757a2edf46d3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:26 +00:00
Bill Yi
75442bdb74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 830c1d7b09 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: I651a2db2f184d3db6b3c68c6d9ee4b6cac45205d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:26 +00:00
Bill Yi
335f8e6652 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 280da2a5b3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719929

Change-Id: Id29e52be2801453d81608771172d9a93a7681b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:11 +00:00
Arc Wang
ca436b7e59 Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:33:36 +00:00
Arc Wang
5eabdc88f0 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:27:16 +00:00
Arc Wang
481113b6a3 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:27:07 +00:00
Arc Wang
688ec25ca8 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:26:56 +00:00