PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,068 Commits 1 Branch 0 Tags
4baccb32a9166dc40f469444dc474ba8242bf94e
Commit Graph

132068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
4baccb32a9 [BiometricsV2] Refactor EnrollFinishFragment 
Refactor FingerprintEnrollFinishFragment to kotlin and add bindView()
method for it

Bug: 286197658
Test: atest FingerprintEnrollmentActivityTest
Test: atest biometrics-enrollment-test
Test: Manually test enrollment
Change-Id: I59af5cc96369e63a4d755f5618f05dcf89cb0a50
 2023-07-11 07:06:21 +00:00
Bill Yi
326807b65e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours am: d148a02796 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib454886456991966d365c8592a031acc62a10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:25 +00:00
Bill Yi
598146af20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours am: bed14260bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3900b9291800f143ca519fa4ca633b79da99679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:10 +00:00
Bill Yi
ea649e658a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours am: f0e9f6102d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4337cfdf834212d9660eeb946ca6238bdb89723f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:51 +00:00
Bill Yi
cadb24431f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours am: 5679d090e2 -s ours am: ee360ca80c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bf9fc6c2e32882bfd2d7065a6c43a420091c8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:35 +00:00
Bill Yi
c466f886e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours am: 795c1d48bc -s ours am: 2c4950cb81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I153f8d40d49cf96661b58921dddc1ce94990b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:33 +00:00
Bill Yi
e3fabde654 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours am: d3fe40fc73 -s ours am: 67de158d99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I484bd83f774b08efc8476b5ac260da2cd6f5baa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:22 +00:00
Bill Yi
f63158b32d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours am: 0569968d37 -s ours am: b61219c22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e149c6890fdf4322c2b8e7b20eb84cc2bff5f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:09 +00:00
Bill Yi
cd5054079b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours am: ab5f054b40 -s ours am: 7ab37f4a48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c4754e1f14264c3792b5301e68ac572c4708632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:51:57 +00:00
Bill Yi
272479c274 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 852ae30fee -s ours am: 02e9928931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1829a057615ea246674446ad0325c9166683e7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:50:00 +00:00
Bill Yi
37c69f0467 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: c732e1f988 -s ours am: b91957c3f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I022dbd1ea699ccdec20dadf3cd9add5cc8c1d876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:49:48 +00:00
Automerger Merge Worker
e610b4df6e Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: e766e5fd00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940945

Change-Id: Ia57c142cd6c200843b73889a292a427b536f6c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:22 +00:00
Bill Yi
f4e775f7a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: 3787e12f84 -s ours am: ee3c308130 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia71b45c02f942e55cdd090645e0eb3352df28300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:09 +00:00
Bill Yi
823ef625a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 49364cf09e -s ours am: f780ee4889 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33d464f6b3f639838c0bab026861f39c3850d45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:42:05 +00:00
Bill Yi
d148a02796 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f9f1172cb7d53b381e8fe63ea4090d6c1fa4622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:59 +00:00
Bill Yi
dac6fc6883 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: ff7929763e -s ours am: e667d7f594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fef906733df17f911a90021b4c275a001a22341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:51 +00:00
Bill Yi
bed14260bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd6313f25fb074342731a44d3e711b06f075bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:45 +00:00
Bill Yi
f0e9f6102d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a07c8817b15adb5153bff2c20c8ea0351b2c808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:30 +00:00
Bill Yi
ee360ca80c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours am: 5679d090e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46d6a6e7fef51d6487f676a9e12348d81a54a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:12 +00:00
Bill Yi
2c4950cb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours am: 795c1d48bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12995ac38ff9f5e276008a3b930b3700908c6c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:21 +00:00
Bill Yi
197565858f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: a64570d332 -s ours am: 0ed322ed8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id24454ea1d3fab7c5ea5bc5b6b80527207708a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:16 +00:00
Bill Yi
67de158d99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours am: d3fe40fc73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebdbece454fe0d5d68c56f063b4fb415e24e0857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:12 +00:00
Bill Yi
61b2d80b8c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 47229f8506 -s ours am: 49b3906a89 -s ours am: 642fdeedbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01d7d7b641ba1ef6e5282a75b90c905461055a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:12 +00:00
Bill Yi
302d3d5d73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 69138bb411 -s ours am: 7ab39a8004 -s ours am: 07b69bda01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I749287435e06c5090c2ba70aea329a46721e35dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:02 +00:00
Bill Yi
b61219c22f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours am: 0569968d37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia67b71092f7748a37cb154bdfe6b1ed26d8c34a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:58 +00:00
Bill Yi
7ab37f4a48 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours am: ab5f054b40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I145b1578f94f580c84236cc645453bdf5669e29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:44 +00:00
Bill Yi
ed94661fad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 8e1bdee14b -s ours am: 46814d48f9 -s ours am: f145436d12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6423da88d09821032320af3322501af2b09eb81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:37 +00:00
Bill Yi
ffda5bb8cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: dc3000031a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe4b93556823211e58a09ef8cd1d8fddb7e8e806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:48 +00:00
Bill Yi
03378d121f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e574dc0d2fb7fea72a36c0ff2fa37cd0a28353a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:39 +00:00
Bill Yi
8b3b262a5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: be172595b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibda8b0af31f603b328c3941aa5d78573147e9e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:27 +00:00
Bill Yi
2e914d0f97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c5a53fb08611551eccb6ddf0040b6996d92da56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:24 +00:00
Bill Yi
fc779544aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice8c5c0ebfd6fd41669a22e4d4fb83857d6e40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:26:13 +00:00
Bill Yi
02e9928931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 852ae30fee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If212d916de0af6b9eb8f3c5ba121097f12250334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:58 +00:00
Bill Yi
5679d090e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbd0a63cb491eb64eeb98c964bcb1a9ecc46e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:58 +00:00
Bill Yi
b91957c3f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: c732e1f988 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5441b78221a2ba4f5817168522dbcfee74e1ea07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:47 +00:00
Automerger Merge Worker
e766e5fd00 Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: 3787e12f84 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 47229f8506 -s ours am: 2aaed05e28 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 69138bb411 -s ours am: 10f99a7ffa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 8e1bdee14b -s ours am: 2386df5475 -s ours
 2023-07-08 19:24:49 +00:00
Bill Yi
f21affdd4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 3cb444b78c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae190469593278494638be782e10eeef7f50af22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:24:04 +00:00
Bill Yi
880c989c5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: eddb9f6a03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic586b771742371ad815ec9f9742bd2456eb94afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:54 +00:00
Bill Yi
5e9e77e3ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 794185fe20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a1bcf2d4fa9e8d4a439cfdbcdd4641da6abc7e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:41 +00:00
Bill Yi
f780ee4889 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 49364cf09e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e08e967efc833eff05375486167ee3b3390d537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:38 +00:00
Bill Yi
13ffa206ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 3877ab434e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6fc46e2f0cc881d4d43d9556b69d66e37743702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:29 +00:00
Bill Yi
795c1d48bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3727e4d5a1116cb0a223c2c007e5913df2533a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:23 +00:00
Bill Yi
e667d7f594 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: ff7929763e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3534642206d438765e7d9d3c4d59117dd0330fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:18 +00:00
Bill Yi
d3fe40fc73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5caa74d0b77e24e128b48ceb50f53a6bf03b697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:17 +00:00
Bill Yi
0569968d37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1ce6ccf9952c32307f1d552fe7ce174cb0b2181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:06 +00:00
Bill Yi
ab5f054b40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I799ccf68bac0c48c8d60ed3c2eb9e338c45f5f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:22:45 +00:00
Bill Yi
ee3c308130 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: 3787e12f84 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e6fef671d2b71bf94312252238601e1cb880f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:22:36 +00:00
Bill Yi
df6c7d4d2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 47229f8506 -s ours am: 2aaed05e28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37d8673c831b2f657b45e67679386053adc16226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:22:26 +00:00
Bill Yi
ec08718498 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 69138bb411 -s ours am: 10f99a7ffa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2a6ccd8f2026e4bbdd861f89248c68f7b0c2f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:22:13 +00:00
Bill Yi
f7f6d4e06c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 8e1bdee14b -s ours am: 2386df5475 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0dabb4fe2f55781a4cfb413b407f5fcb6218c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:22:01 +00:00