Treehugger Robot
dcd3081158
Merge "Remove luyota from OWNERS."
2022-08-16 01:53:34 +00:00
Cole Faust
a21ac03acb
Fix array-related errorprone warnings
...
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.
Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
2022-08-15 18:52:37 -07:00
Julia Reynolds
2a61b3656b
Update Bridged app link when NLS access changes
...
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1
[RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
...
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication
- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication
- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID
Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5
2022-08-15 13:31:52 +00:00
TreeHugger Robot
f38346a569
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ec740c30d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: Idec6bc26eda8a7a2542503f351264dfb9eda0720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-14 21:18:13 +00:00
Bill Yi
94e8fafbf2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2337f90b7e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602319
Change-Id: Ie9f2f05c38f72f6ad035f3b2102b065ac4e9bb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-14 21:17:47 +00:00
TreeHugger Robot
ec740c30d5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-14 20:53:24 +00:00
Automerger Merge Worker
1a16cd5b46
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: If9e522e1a986e16dd573b8211c243b98df7b0cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:18:12 +00:00
TreeHugger Robot
dc2cfedb43
[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: ff652e848d -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: I4ef5c97ffe12a5707b1f0c7a70207084e8fb1376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 05:17:59 +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: 957768ce00e91b230baccedd9510e11215a5dff39d4bf7b2239b8d62847e0e2272c6f66e1b3b15d60d14a19eeec64165dc4a89ae91f7cd76812fbeb1
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
Automerger Merge Worker
a5c64e1c4d
Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00e91b230baccedd9510e19d4bf7b2239b8d62847e0e2272c6f60d14a19eeec64165dc4a89ae91f7cd
2022-08-13 04:59:21 +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
TreeHugger Robot
ff652e848d
[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: Id37d89f8b7fa6c9c69a67ab67b679ea4ae04f149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:59 +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
Bill Yi
32a3dfba00
[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: Idc789a5e94653d1c558d61d05a50d5fe3acf2f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:51 +00:00
Bill Yi
eb729828db
[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: I8b78949d9fccd477c64d772c4cae351008e09f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:41 +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
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
Automerger Merge Worker
cd4e51939f
Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70faf92894768f6e59b16b1a6b09835d1e
2022-08-12 20:18:59 +00:00
TreeHugger Robot
d0223cc521
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f92894768f -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: Ib84637b04cd657d064844de33db328b6fdf7f068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:45 +00:00
Bill Yi
563cb22c41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: 6b09835d1e -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: Icb75ad5b3cc5a7aaf7395f27b9f4e5801f57ee5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:24 +00:00
TreeHugger Robot
59f982a6b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f0361b3188 -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: I8e0cb90dc526eccdf738165ae9dfb6553bb41d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:16:05 +00:00
Bill Yi
0bb9bea783
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: b530fcdd2f -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: I6c94529d3be751f99ad02f9bf568806f3c5d8f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:15:43 +00:00
Automerger Merge Worker
a72452db78
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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I04469b260b2588684c3390de9336ae8fe68f0e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:41 +00:00
Bill Yi
877d23dded
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: e001721f49 -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: Ic4f09d13d2e31bdb1a980863cbce19504238fadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:16 +00:00
TreeHugger Robot
f0361b3188
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -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: I59064adc6cbf5ccd656e966f149943dd57798b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:35 +00:00
TreeHugger Robot
f92894768f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -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: I98da540c0dc07551a1ecdf8c7bf7b87f16be53c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:30 +00:00
Automerger Merge Worker
e36e9757ef
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
2022-08-12 20:10:25 +00:00
Bill Yi
b530fcdd2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -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: I3c09e2d6b833257910a84819c7b08b8dac696dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:10 +00:00
Bill Yi
6b09835d1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -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: Ib0c9054563ab03e9075de4b3c55bdd8fe02ddc71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:08 +00:00
Bill Yi
42dd80e568
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -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: I9dc268cb3347ee8480f643a49044f21bb7d3a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:09:20 +00:00
Bill Yi
c5569d9d42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: 76182fe42d -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: I77aeeafdb3edfef16a181dff0626fa6059ebd283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:08:44 +00:00
Bob Badour
2e005f4cec
Remove luyota from OWNERS.
...
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
2022-08-12 19:57:37 +00:00
