Commit Graph

114289 Commits

Author SHA1 Message Date
Automerger Merge Worker
8f49f14a23 Merge changes from topic "am-ae7375ba66c94a8f9d459c889d6bf72a" into tm-qpr-dev-plus-aosp am: 70b822f133
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: Ic6f07a35106da76270556bdd4c3c0d03e6751f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 02:51:26 +00:00
TreeHugger Robot
ff2491c0f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours am: 1215a5dff3 -s ours am: 6093732898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibec493b378a824ac34f05c4195917c82b67b2247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 02:51:17 +00:00
TreeHugger Robot
e747d74928 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: fb1a655d43 -s ours am: 3242d750df -s ours am: 5637ebfb5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a3c9142a19dddbd197f8b574ca155a3398b5043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 02:49:46 +00:00
Bill Yi
0113f785b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: fdc0cac006 -s ours am: 7b7035e940 -s ours am: 12e87dfaa8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56e89af6132900355d83035f5fcd034200c52f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 02:49:39 +00:00
Bill Yi
ca7d41676a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 7e6afc5894 -s ours am: 16023d11c8 -s ours am: eccbecf4f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I205b7f3686a09d34faefd34cc46dcd66bef97f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 02:49:27 +00:00
Han Xu
b4be0a3c5d Merge "Add BROWSABLE for most Settings Activities" 2022-08-16 11:24:41 +00:00
Han Xu
b7d1077ada Add BROWSABLE for most Settings Activities
so they can be opened via webpage link.

Bug: 238966547
Test: manual
Change-Id: Ic52895ce0577246a2bbf9536fce1e10ab41f7605
2022-08-16 13:02:57 +08:00
Jack Yu
f8b664e31f Only primary user is allowed to control secure nfc
Bug: 238298970
Test: manual
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2022-08-16 02:59:18 +00:00
TreeHugger Robot
aef0cde406 Merge "Fix b/242252080: Add padding space on the top of the battery chart" 2022-08-15 10:24:26 +00:00
Zaiyue Xue
c931670a99 Fix b/242252080: Add padding space on the top of the battery chart
screenshot: https://screenshot.googleplex.com/9XU9Yiwv9YAVd46.png

Bug: 242252080
Test: manual
Change-Id: I81730168337b311600a12b844753848c21105d46
2022-08-15 16:19:19 +08:00
Zaiyue Xue
7384298061 Fix b/242254055 Battery usage initial screen improvements (long data loading time)
screen record with forcing 5s loading data: https://drive.google.com/file/d/1qIkY9U55oF8ktNqiJtxMW7K8sVuJDgTa/view?usp=sharing&resourcekey=0-BJTVh6GcvpXeTqwOQzmzYw

Bug: 242254055
Test: manual
Change-Id: Ic6a907ddc4e932ef0256f96556667cd681ef0ebc
2022-08-15 15:52:51 +08:00
Bill Yi
b935f1e10b Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-15 03:52:22 +00:00
Bill Yi
0e7e9c61c6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-15 03:52:22 +00:00
Automerger Merge Worker
70b822f133 Merge changes from topic "am-ae7375ba66c94a8f9d459c889d6bf72a" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours am: 1215a5dff3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: 0e2272c6f6 -s ours am: 6e1b3b15d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 89ae91f7cd -s ours am: 76812fbeb1 -s ours
2022-08-13 05:15:16 +00:00
TreeHugger Robot
5637ebfb5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: fb1a655d43 -s ours am: 3242d750df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I467c80b142a6a6253da522e27ea857bbc8a52c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:14:08 +00:00
Bill Yi
12e87dfaa8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: fdc0cac006 -s ours am: 7b7035e940 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I905b0b4da6c0ed5044dbbdf7e2f1ae700364eeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:13:57 +00:00
TreeHugger Robot
6093732898 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours am: 1215a5dff3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaeb94c4a9d560c288748ad7f4f0a8bc241a7ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:13:48 +00:00
Bill Yi
eccbecf4f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 7e6afc5894 -s ours am: 16023d11c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8b6c3f55427aaa8649183c4b48307eb2889c246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:13:48 +00:00
Bill Yi
5b9d3c21a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: 0e2272c6f6 -s ours am: 6e1b3b15d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3d4d17e2ecc9fe6f88fff3f8cf0dfc0f9f58d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:13:38 +00:00
Bill Yi
a386abb37a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 89ae91f7cd -s ours am: 76812fbeb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5857d1068586da61a11942ed39976de419bd9f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 05:13:34 +00:00
TreeHugger Robot
3242d750df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: fb1a655d43 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa816686a55abeeba8cde8df5f2b4955c5e383c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:58:29 +00:00
Bill Yi
7b7035e940 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: fdc0cac006 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida5272e4d43c3c3220669a11aa8487d702ad9ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:58:20 +00:00
TreeHugger Robot
1215a5dff3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e2e6a80985483ea90a3ec2d1727dbc481b3d3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:58:16 +00:00
Bill Yi
16023d11c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 7e6afc5894 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7a9462448c27e3a14bb0b99220bdc2a5fc072ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:58:08 +00:00
Bill Yi
6e1b3b15d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: 0e2272c6f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie58fb6523c3541c36417c1decb945010feb56a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:58:05 +00:00
Bill Yi
76812fbeb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 89ae91f7cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia07419031ac07860372dfac9a44244c027558b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:57:57 +00:00
TreeHugger Robot
ad0ba2a0ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: 3d90229d7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0305b65adedf364c6c874c0dce8433ba4db372d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:57:39 +00:00
Bill Yi
dacad238ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: d011dd118c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id08f874bb4455c9e2e5095e4b05fea3edc5f8a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:57:29 +00:00
Bill Yi
8dc74f00d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 04e9e462bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1aafbd82ca2326fb372b4f36b92bf49570216288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:57:21 +00:00
TreeHugger Robot
cedd9510e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03bd64208ce12db81a9f8baf2aa7915bc452e4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:19 +00:00
Bill Yi
0e2272c6f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c3534ae74b3530ce4b795b90f2fe4abf07a23b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:09 +00:00
Bill Yi
89ae91f7cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d548bafd75b267eda401f03d688edae9f8c0565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:00 +00:00
TreeHugger Robot
3d90229d7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2dd146d0d12fedd84c97f9b801b6fa7f4106ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:32:06 +00:00
Bill Yi
d011dd118c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a9c1bed2609d20aa8bc2fea4215ee911ef05e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:31:55 +00:00
Bill Yi
04e9e462bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2684be3a39e8650d8d8357d95b4d1b634baee46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:31:46 +00:00
TreeHugger Robot
fb1a655d43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc9667b3aee16b4427d2cf6152f4681c22c80745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:31:33 +00:00
Bill Yi
fdc0cac006 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I521168c647bdb9206bc761ab03400536e62b847f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:31:22 +00:00
Bill Yi
7e6afc5894 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I327cd9cef8cc65110a765c287df93689ca7bedda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:31:15 +00:00
TreeHugger Robot
e91b230bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:01:17 +00:00
Chloris Kuo
ec46abccf7 Merge "Fix settings crash when enhanced notification shown in search results" 2022-08-12 23:00:21 +00:00
Automerger Merge Worker
0b29492eb7 Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp am: cd4e51939f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321

Change-Id: Iaa640a893f0358967e54e6b894f6fafc5719e13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:44:25 +00:00
TreeHugger Robot
53d15f8a41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f92894768f -s ours am: d0223cc521 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id52c29f0aaefd689ca15dc69180cb6c104903c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:43:57 +00:00
TreeHugger Robot
11a504728c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f0361b3188 -s ours am: 59f982a6b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c0ab6a85b3067afe0cb39a62c8620c6182bf1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:39:48 +00:00
Bill Yi
844659dca5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: b530fcdd2f -s ours am: 0bb9bea783 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6823a7293ce9043ca1fef4c415394ea980c3098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:39:23 +00:00
Automerger Merge Worker
812521e7b6 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp am: 4fec01b98a -s ours am: a72452db78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99a292d2eacf10e7e50b057325f0c846632a0c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:37:04 +00:00
Bill Yi
52758200cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: e001721f49 -s ours am: 877d23dded -s ours
am skip reason: subject contains skip directive

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

Change-Id: I473a9c5bc4d7bb129594cf007db27d4d2b5d4faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:36:41 +00:00
Automerger Merge Worker
235303126d Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours" into tm-qpr-dev-plus-aosp am: e36e9757ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic02ebff2024d7e49680fab35c16536c58b325ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:32:38 +00:00
Bill Yi
c9e791e6f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours am: 42dd80e568 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97f01ded71e0763075c1bfa254319c711eb4941f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:32:10 +00:00