Eric Biggers
ff16ec8542
Use StorageManager.isFileEncrypted() instead of deprecated methods
...
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
and isFileEncryptedNativeOrEmulated() are the same as the new method
isFileEncrypted(). Replace all calls to these deprecated methods in
this repository with isFileEncrypted().
Bug: 232458753
Change-Id: I95beea86ef771396c2e08f2d6a643fdc629ad89f
2022-06-10 17:42:38 +00:00
Neil Fuller
b16b5b5476
Merge "Switch auto time setting to use APIs"
2022-06-10 13:45:07 +00:00
TreeHugger Robot
861ee5b749
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: 999a23bee0
-s ours am: 579cdfb0a8
-s ours am: 664882ad8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I414379b3f5d42cd70b6d6f0c064c4c7eae84767d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:27 +00:00
Bill Yi
6f84923110
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 16761c0f92
-s ours am: ca3537a81e
-s ours am: 78f220eba8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: Ie0391e24129aba025f3e57a1731f284d7dbe4fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:24 +00:00
TreeHugger Robot
e5a38588ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 3b34105f01
-s ours am: 772ae4174e
-s ours am: 95f865c789
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I504a4510085f50fc8db0140b832b046aa7f5119b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:15 +00:00
Bill Yi
aa0c19f905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: b807236c50
-s ours am: 26d9456296
-s ours am: 4835ec5d28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I762d56927958056780d4e644c684cb7be7806cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:02 +00:00
Automerger Merge Worker
c4012459d7
Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp am: 06908e191a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I5ab8041f693777d8e47f1c9e1d4ca6159cf873db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:19:20 +00:00
TreeHugger Robot
be2b7518e9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 05d57094a6
-s ours am: c4141b38c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I472139447bfa4e08e71f83f3f2c23b29f0090aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:19:08 +00:00
TreeHugger Robot
5eea619c04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 3bf9830e4f
-s ours am: 76a3494ee9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: If7eabf5d79f03542bfe5fcfc90e6675b588b02dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:33 +00:00
Bill Yi
164a34e5d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours am: 2ed856f004
-s ours am: b9e43fd0ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I35234cef47e502ad25c901d53666d465b529d444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:26 +00:00
TreeHugger Robot
b5484e8860
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours am: 706ca35aa8
-s ours am: 6ee656bf72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Id9deffe18c543c162b1651727081002cb2a1bad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:15 +00:00
Bill Yi
a7c35d7d1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours am: f9494d6c97
-s ours am: 94e7c41bf4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Ibf38e3198bc06b9980b5fdc5b56ff8ef578a0e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:08 +00:00
Automerger Merge Worker
746e79088b
Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp am: 03cc022e78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I4e0237cee04b0eced05a36a79746c001af840225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:08:40 +00:00
Bill Yi
739377269e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours am: b76ebc730e
-s ours am: bd823ebb95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I67783d280af53f3af13fad5f6128dbd2a8ef08c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:08:11 +00:00
Bill Yi
2c1fea86e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours am: b28b4c141b
-s ours am: 378c90f469
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Ife6264e73e046e9ce7bc277250a28e9f43384b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:00:06 +00:00
Bill Yi
b0e61c5621
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours am: c6445438aa
-s ours am: db4123045a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I84dbc6db88b556053bd90c651b88286a9e8ab43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:00:03 +00:00
Bill Yi
4e37c9d2d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours am: ce611beecd
-s ours am: f6c7d6d2cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: If9cbc628c764029684e6a511827bb88dfa2069ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:59:48 +00:00
Bill Yi
61aae48499
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours am: 06ae56ce9d
-s ours am: c4896dea9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Ie2e497da63a9f014518047fdca23bd4d0c1a1749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:59:33 +00:00
TreeHugger Robot
664882ad8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: 999a23bee0
-s ours am: 579cdfb0a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I4a022cb6d72789a0accda59ba71b4cc59e2942bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:37:37 +00:00
Bill Yi
78f220eba8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 16761c0f92
-s ours am: ca3537a81e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I1dbe6c3e89701c74c494487617ed86f7c5d78c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:37:33 +00:00
TreeHugger Robot
95f865c789
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 3b34105f01
-s ours am: 772ae4174e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I7237ff4f9f469ec33c4a01200af128413ead5334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:37:25 +00:00
Bill Yi
4835ec5d28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: b807236c50
-s ours am: 26d9456296
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I4725a02f665e6b759eb13149fd7daf258d7c7400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:37:11 +00:00
Automerger Merge Worker
06908e191a
Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 05d57094a6
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours am: 0aa65938ba
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours am: 5bc97b815c
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours am: e64846d166
-s ours
2022-06-10 07:36:03 +00:00
TreeHugger Robot
c4141b38c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 05d57094a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I500a32dba0ab3770f7083b311df01f4d5e3640bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:35:17 +00:00
TreeHugger Robot
76a3494ee9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 3bf9830e4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I53ffa4eaa9cb1c3b262cc0ae4af71147f3e5c6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:35:17 +00:00
Bill Yi
b9e43fd0ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours am: 2ed856f004
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: If2e520f9cf323ed0dd6e4c4aabdfa279e0cf46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:35:11 +00:00
Bill Yi
fb4c089c42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours am: 0aa65938ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I384af9f577a42a3cb78c213acdd1a195b7ae2324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:35:11 +00:00
TreeHugger Robot
6ee656bf72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours am: 706ca35aa8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Ieb7958bda7a6c528e6d7080c0e7bda33eac1f889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:35:00 +00:00
TreeHugger Robot
66247fc9d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours am: 5bc97b815c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: If082c785b69f2d990ac8c5bb0d2b9ab08ec6bd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:34:59 +00:00
Bill Yi
94e7c41bf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours am: f9494d6c97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I3d04a0540a9c6fbf3d80ca69ec48a1de88143f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:34:52 +00:00
Bill Yi
b28291edce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours am: e64846d166
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Ib3d64e274e32564a83d4a129d44af477db7a4247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:34:50 +00:00
Automerger Merge Worker
03cc022e78
Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours am: b76ebc730e
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours am: 59fa253f8a
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours am: 6b1fcc6bd5
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours am: be7ddbcb78
-s ours
2022-06-10 07:32:42 +00:00
Bill Yi
bd823ebb95
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours am: b76ebc730e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I86a5cf9491a59f87bd6fa8e23a3f5f32373e7d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:31:34 +00:00
Bill Yi
1d2787d61b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours am: 59fa253f8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I0d6864fd18072d54a06484388cdc268fe14d1033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:31:31 +00:00
Bill Yi
cf07ce12e5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours am: 6b1fcc6bd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I7abfdeb4df210858f09481270e61d64478d2b375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:31:16 +00:00
Bill Yi
378c90f469
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours am: b28b4c141b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I967f4347625ffa9b1eab097611ffe440b6787069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:31:01 +00:00
Bill Yi
9215c120ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours am: be7ddbcb78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Idff3d14af6e4fb6289014f1631e4ff5434bece0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:30:59 +00:00
Bill Yi
db4123045a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours am: c6445438aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Idbd1c86de5f83092148664415e4415bf1f65544b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:30:58 +00:00
Bill Yi
f6c7d6d2cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours am: ce611beecd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I5fb19aa54988c81ceb1914fe281e800dd8dcc5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:30:46 +00:00
Bill Yi
c4896dea9e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours am: 06ae56ce9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Ib86550c824558237668f33d6483f496edf65b373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:30:26 +00:00
TreeHugger Robot
579cdfb0a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: 999a23bee0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I322bfe17e2523248e6ed8b06bcba7aad7969c653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:45 +00:00
Bill Yi
ca3537a81e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 16761c0f92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I4e8a5a18aa22dd34b003f94d3bf3d88a2ec9792a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:40 +00:00
TreeHugger Robot
772ae4174e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 3b34105f01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I5db3c180784c87c4f00d7e7953fa81641196e3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:30 +00:00
Bill Yi
26d9456296
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: b807236c50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I27493619de76ff5485c6cc4bb5df96268987cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:17 +00:00
TreeHugger Robot
05d57094a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I83f149c01d1de95b08d8d5cf2c8e959a39dc1c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:31 +00:00
Bill Yi
0aa65938ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I55d4f86e6d7479dad325069b495eee62ae4c0780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:28 +00:00
TreeHugger Robot
5bc97b815c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I8091c5b7eff6c9186dc88875d8249e34ddb24839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:18 +00:00
Bill Yi
e64846d166
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I2abd5bb39947895fce5118ce8b81cab935712463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:06 +00:00
TreeHugger Robot
3bf9830e4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I76ebc79be223327660477cdad86d556bef0b5e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:50 +00:00
Bill Yi
2ed856f004
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I864b6a2fd0ff2a3f9d46e44644f14c3d711ac3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:45 +00:00