PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,491 Commits 1 Branch 0 Tags
d0a8df6667882eff2d65586cb35f5febf89af93c
Commit Graph

104491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
103ae973be Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe am: 080ef875d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ica4020bbf19115143d35ab18a3eee8dc146b24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 14:49:43 +00:00
Betty Chang
d956e1cdec Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe am: 6b6ae74f41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: If74784db890682edcc9bc4ecfccdcadac623fa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 14:49:12 +00:00
Betty Chang
080ef875d8 Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ia13a32d105fc1fbf72e42ef133a75e0ae7fd872c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 14:14:57 +00:00
Betty Chang
6b6ae74f41 Merge "[LE Audio] Broadcast Sink UI" into tm-dev am: 6ebed73fbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Change-Id: Ib3761f86ff083ae83ea17646428f9f70c9428867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 14:14:05 +00:00
Edgar Wang
a8d7f3dede [automerge] Fix "Factory Reset" fails to reset the device 2p: f8739eda93 2p: 8b50a41576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I2fa412d8b99e1ce87b1b89f632eb18f477cec167
 2022-04-11 13:58:27 +00:00
Edgar Wang
8b50a41576 [automerge] Fix "Factory Reset" fails to reset the device 2p: f8739eda93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I614552d70356794daa34623d26924c0a65f91430
 2022-04-11 13:58:18 +00:00
Betty Chang
6ebed73fbe Merge "[LE Audio] Broadcast Sink UI" into tm-dev 2022-04-11 13:57:52 +00:00
Edgar Wang
f8739eda93 Fix "Factory Reset" fails to reset the device 
when device didn't support PersistentDataBlockManager, Settings will
crash at get PersistentDataBlock service.
So we need to check if device support PersistentDataBlockManager
before call getService.

Fixes: 196634851
Test: manual verify on aosp build.
Change-Id: I5afba5df8c4831499478490b442c0fcf367d23ae
 2022-04-11 21:50:01 +08:00
Edgar Wang
8b2165a414 [automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e 2p: 739a359b07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395

Change-Id: I84b8d5cd0c913106597377a2392489469f8f6c13
 2022-04-11 13:29:21 +00:00
Edgar Wang
739a359b07 [automerge] Index the gesture options in System Navigation Settings page 2p: 257ebe4a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395

Change-Id: I0d3b1e9416e0928cae610f1b36825b6f325f6b73
 2022-04-11 13:29:12 +00:00
Edgar Wang
257ebe4a5e Index the gesture options in System Navigation Settings page 
Fixes: 167536360
Test: manual verify & robotest
Change-Id: Ie1a24a7206153dc1405f8a28369a6bade11ddd39
 2022-04-11 21:05:37 +08:00
Tsung-Mao Fang
ae4e50dfdd [automerge] Fix color lint 2p: e706ccc59a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684394

Change-Id: I9a0136789a69e54ce713724de0bac458eb9161ba
 2022-04-11 12:42:57 +00:00
Tsung-Mao Fang
e706ccc59a Fix color lint 
Test: repo upload
Change-Id: Ia39bcf291fb84ff7f27e52b45a28f946b2d3a75f
 2022-04-11 20:40:18 +08:00
tom hsu
3558492c55 [automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac 2p: a7377878be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392

Bug: 228563549
Change-Id: I0da02d0abc2eb416c05194748366b8b2e25fc607
 2022-04-11 11:11:06 +00:00
tom hsu
a7377878be [automerge] [Panlingual] Fix settings crash due to no content view. 2p: db1b6accac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392

Bug: 228563549
Change-Id: If21482100aa626c077bdd50dda1bd47bd6691636
 2022-04-11 11:10:57 +00:00
tom hsu
db1b6accac [Panlingual] Fix settings crash due to no content view. 
- Sometimes, listview may not created instantly, so move the action of
   addHeaderView after fragment finished the onResume;

Bug: 228563549
Test: local
Change-Id: Ie5d53c962bed35783decd374c743a168a98cbf6a
 2022-04-11 19:10:18 +08:00
Presubmit Automerger Backend
301f134325 [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61 2p: 81fe82cadd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I98c0fe27e795c2115f7dd725eeda315497a724ad
 2022-04-11 08:19:04 +00:00
Presubmit Automerger Backend
81fe82cadd [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I327f34d0ffc5270d0869e20a4345d5f95adf42ec
 2022-04-11 08:18:56 +00:00
TreeHugger Robot
e41c373f3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours am: e23c8f1689 -s ours am: 4401a4ce15 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1076cb623b499796137a49e39f400267f7dd2a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 08:17:55 +00:00
Bill Yi
1284e19cca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours am: 481bdb2265 -s ours am: 31360b1240 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a5d0391ae2417855b09558361bec501539a97f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 08:17:53 +00:00
changbetty
a56e198c61 [LE Audio] Broadcast Sink UI 
- Add dialog for Broadcast and find broadcast source

 - Add Activity for find broadcast source

Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
 2022-04-11 08:15:10 +00:00
TreeHugger Robot
4401a4ce15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours am: e23c8f1689 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0f9c8f94e4a4ff0c5abf2d2b9ba7fc7deaf1f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:56:32 +00:00
Bill Yi
31360b1240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours am: 481bdb2265 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d779ac96dbf7827a1b1f59f0869a16bbdfe2de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:56:31 +00:00
TreeHugger Robot
558adb5b0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours am: 69985d41a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I570e3a3c8e043af01e6967d78cd3fbefa7d27744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:55:58 +00:00
Bill Yi
9caa990931 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours am: 4c909c1c25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c05f2f9491bd72c6aa2a363307833d8e492fe86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:55:55 +00:00
TreeHugger Robot
e23c8f1689 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8715452e0a3d627dd01eea156af17c2afd1bb913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:33:59 +00:00
Bill Yi
481bdb2265 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3c055fbd1fd16499e0238a6774e504d4b039073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:33:57 +00:00
TreeHugger Robot
69985d41a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e30961b85c4152b0e47c4c500d647126442540e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:32:53 +00:00
Bill Yi
4c909c1c25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I312f44cb6a995b6a75f48d065442291d4de9d31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:32:51 +00:00
TreeHugger Robot
8c27b368e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours am: 1a01f1b93e -s ours am: 0bd17b37e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I363183f68df2013bfbf950f52864af811694d654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:21:13 +00:00
Bill Yi
72fbfe0abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours am: 9b908935b2 -s ours am: b3f705b1ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I386a63e5abb64789cc7d9dffe8549ce810560177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:21:11 +00:00
TreeHugger Robot
4ef56a8d9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -s ours am: 6cf3ba6730 -s ours am: 23f4789154 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5cadf55acfc0f86ae68498c94aecc5fc5492c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:21:04 +00:00
TreeHugger Robot
bcb600b59d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours am: 579f0df02b -s ours am: 48b1d507f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib093b46a6211ea40a2f30641c20039a20c0c9a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:20:56 +00:00
Bill Yi
fa39d743d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29510c162d -s ours am: 60089ac6c2 -s ours am: 3d8e4e273c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03ca60475a083fc6d38da0196c262be1fbeafc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:20:55 +00:00
TreeHugger Robot
67e61415bf Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46bc am: 068af6fb61 am: b2c2163966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004

Change-Id: Ib075c989396872e50875578b866bc6ab9b3cbaa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:20:39 +00:00
Bill Yi
3c45b92241 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 am: 7f2b0a3e06 -s ours am: 29b997cff3 -s ours am: 0edffb6516 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie70d6bd7522cd44c4e1fee9a9f0b33820587cea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:20:38 +00:00
Bill Yi
dc97fd8d8f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours am: 80f9c4f88d -s ours am: b4736f8091 -s ours am: 5fe4742648 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c245a7b3c0e82acf1674ef60280e5735b41b004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:20:03 +00:00
TreeHugger Robot
e9b077e6eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3dfa1dbed5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9742889b3a36d3ac6134d825d5c28bc994f6eaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:19:37 +00:00
Bill Yi
ac80bb62f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0577d71f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f5b2c171cdf887199c93acc343a4627a05e05e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:19:30 +00:00
TreeHugger Robot
18bdecad94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8793bb8cecefada63074542b428549ca222330b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:17:13 +00:00
Bill Yi
3d34896214 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97e9045aa6b5e9c5928968f3998e57d458ef1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:17:11 +00:00
TreeHugger Robot
0bd17b37e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours am: 1a01f1b93e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f3476a75af56cfc2772bccf74035836323e6e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:42 +00:00
Bill Yi
b3f705b1ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours am: 9b908935b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cea91a0675a0dfd997649d413ceed5db490b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:41 +00:00
TreeHugger Robot
23f4789154 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -s ours am: 6cf3ba6730 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3c9fe7e84d9ad59e50be0bcfad272c54c024827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:36 +00:00
TreeHugger Robot
48b1d507f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours am: 579f0df02b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34e6993bbcd3fda46b2e4095dcb455aca77595d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:30 +00:00
Bill Yi
3d8e4e273c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29510c162d -s ours am: 60089ac6c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57e50f08f2fcef74cb95e470a64ebb7409d3fd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:28 +00:00
TreeHugger Robot
b2c2163966 Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46bc am: 068af6fb61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004

Change-Id: I7f819456179ae0b99dd6e7d177f14f0cfbb5ab8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:22 +00:00
Bill Yi
0edffb6516 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 am: 7f2b0a3e06 -s ours am: 29b997cff3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29658c67ede1f2f220639cd21570109926633adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:21 +00:00
TreeHugger Robot
1a01f1b93e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67d14af8f03da2bdd4edbc5d5261f812489e86ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:18 +00:00
Bill Yi
9b908935b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9490a0b0eba197d8f16c537d5980636839bf6d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:47:17 +00:00