PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,715 Commits 1 Branch 0 Tags
bd2f5b7e1e19abcb15557ea12f537a4495878048
Commit Graph

106715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bd2f5b7e1e Merge "[Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8" into tm-d1-dev-plus-aosp am: 1811ddabe3 am: 35830e04d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Ie8871befd8ec93e71af6b344945ec83c50c81d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:36:46 +00:00
Tsung-Mao Fang
d299eea61e Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: 8998aeb1fc am: 69328314ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I67689f70ee7df716a917d03e3071b399992daa44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:35:52 +00:00
SongFerng Wang
acf4b251c9 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885 am: 6e60b53542 am: da313f5e1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ide3b9a7b6e9fec75ac414a6b2398532d3951cc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:35:24 +00:00
Tsung-Mao Fang
cc13be69d6 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: f9edc98ba7 am: 6493af118d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I9d1a5d9c5e9f25ade3aebef7ba7f29a7b1ae6677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:30:58 +00:00
Tom Hsu
bfffc06157 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: e74b7edb7c am: 1d8e73ab2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I22d6d85d9d0f206b9989b4c8934e0fcf3150342c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:30:38 +00:00
Tom Hsu
afd9e67e05 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197 am: 7c2d110559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Ic64bdf7a64653c98d741cdc3a98ac420cbcbd71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:28:27 +00:00
Automerger Merge Worker
35830e04d6 Merge "[Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8" into tm-d1-dev-plus-aosp am: 1811ddabe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I8bc5a898c79b88d7d6c756261e3c9563519418ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:52:46 +00:00
Tsung-Mao Fang
69328314ce Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: 8998aeb1fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I1d660e44e2795042585334dc36aada70b2867e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:52:39 +00:00
SongFerng Wang
da313f5e1d Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885 am: 6e60b53542 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Id825f8784b7b6e1bf12e82e277c6a7bc4ca8f236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:51 +00:00
Tsung-Mao Fang
6493af118d Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 am: f9edc98ba7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I1b5fe37f1b85b7aa7e7a693389ffeed55363420e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:28 +00:00
Tom Hsu
1d8e73ab2c [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: e74b7edb7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I29f2a85b41db7facafec1a6c091dfe94ce3a8f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:50:54 +00:00
Tom Hsu
7c2d110559 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 am: 1c154f9197 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Iff851855d4f4f8b0c01650b79cc4b52a5ae07780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:50:43 +00:00
SongFerng Wang
6e60b53542 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: I04a8820ecc9e3757bd58a49e4e451cc7a004e9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:28:07 +00:00
Tsung-Mao Fang
f9edc98ba7 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I09616381905908cfebdc0bcb0bced2f6d8176340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:56 +00:00
Automerger Merge Worker
1811ddabe3 Merge "[Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8" into tm-d1-dev-plus-aosp 2022-05-05 09:27:29 +00:00
Tsung-Mao Fang
8998aeb1fc Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: Ieed25319883b72568c1b1c1421452a49578840ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:24 +00:00
Tom Hsu
e8e612c7d5 [Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Ice1bd20d3282d30e53e8bb150bc59437144bd02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:22 +00:00
Tom Hsu
e74b7edb7c [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I8154923e9e3db1e4984889d648cf0cfa17e65348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:43 +00:00
Tom Hsu
1c154f9197 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I0bd679552d03be99daf1e31d120626cc8b9d4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:24 +00:00
SongFerng Wang
e00cbc7885 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:25 +00:00
Tsung-Mao Fang
a0100b2171 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I8a5a602eb88c8947ad1ba293e3477e05d5c99ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:53 +00:00
Tom Hsu
c4603be5b3 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I73dc18b9f3d456cc1c3569be593f0bec37b61e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:28 +00:00
Tom Hsu
fd09e5c0e8 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I51b5f3f60061e41217b277e03686f43fbf85e885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:02 +00:00
SongFerng Wang
afe6d302e4 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev 2022-05-05 08:50:20 +00:00
Tsung-Mao Fang
c5153183d8 Merge "Show slice without toggle when there's no wifi permission" into tm-dev 2022-05-05 08:43:00 +00:00
Tom Hsu
70fe2d1fdd [Panlingual] Fix conflict 
- sync code from master to tm-dev

Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
 2022-05-05 06:18:22 +00:00
Automerger Merge Worker
4188b5ca02 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp am: 363b525796 am: 9568888182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I108af047fae253872a79bac67111ca98d2496744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:07:51 +00:00
Automerger Merge Worker
24ddac3238 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd" into tm-qpr-dev-plus-aosp am: a47e5c7bbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Id1df15eddbf23d039dfd88c4a0974773df08aeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:06:55 +00:00
Daniel Huang
257a6052ab Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 am: e5effd7edf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I85397a27a6cd8e62a38f029ad4e9d45de0ff062e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:05:41 +00:00
SongFerngWang
1709c80eff [LE broadcast sink] Add the source list in boradcast sink UI. 
Add the source list in boradcast sink UI.
Add the password dialog.

hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test

Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
 2022-05-05 06:00:45 +00:00
Automerger Merge Worker
9568888182 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp am: 363b525796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: If4ce8103ba2da3e8608356f762a2e78fe8f8acf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:48:22 +00:00
Automerger Merge Worker
a47e5c7bbc Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd" into tm-qpr-dev-plus-aosp 2022-05-05 05:47:41 +00:00
Daniel Huang
af42043a93 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifa74be8b635a6f4abcf8a0c8ca137be04a85110a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:47:38 +00:00
Daniel Huang
e5effd7edf Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I53c0555f4a325df7bddf2a309c02521716cbfd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:47:37 +00:00
Daniel Huang
62715a9cdd Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ic91f10bc276e2d108739cbfc8df5b115e2fdf667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:25 +00:00
Automerger Merge Worker
363b525796 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp 2022-05-05 05:26:24 +00:00
Daniel Huang
03a2775a32 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ife440db792f001864f3305eed6e3e2200e269d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:18 +00:00
Daniel Huang
e7490f41a3 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ib25ff5bf58f9b3bee0d414e5fe71e38b80c97fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:18 +00:00
Daniel Huang
9a339e9d16 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I1384bf966c0afc391f97d64c389747fe307497cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:09:48 +00:00
Daniel Huang
1737ce56fc Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb Show slice without toggle when there's no wifi permission 
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.

Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
 2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev 2022-05-05 03:46:47 +00:00
Joseph Oh
a9f4f09626 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Bug: 231491884
Change-Id: I5c16cee342da0541c5f2540c6fdc417e668fe0f4
 2022-05-05 03:23:25 +00:00
Xin Li
fb06539bae [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours am: c451743c29 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I0fac990f4261bcab21be06570a3ea2680c2abe6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:08:10 +00:00
Xin Li
c59d502f3b [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours am: 14807f68b6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib6269ab9480935bf645a44a4f09567333bd6be57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:07:59 +00:00
Xin Li
c451743c29 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1970ab4a3c30e9b7b07691b0764bf8227ab931b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:32 +00:00
Xin Li
14807f68b6 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I700946ecc115f36ee95ca5ed94c268cb9000324a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:21 +00:00
Xin Li
e5d25d91a6 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I89ef935da4e4cd866d0300ab387aff6a1ef23072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:29 +00:00
Xin Li
92e90faa5c [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I20d6a10afd7b33ce095b5d1b847995d64d1a0b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:18 +00:00
Xin Li
9895e8e63b [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I9ee9deabfbe58ece7df81f88733417d5b733898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:20 +00:00