TreeHugger Robot
68ed2fb752
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit"
2022-08-09 03:47:33 +00:00
menghanli
1ca385591a
Fix IllegalStateException to get tile content after device rotate
...
Root cause: Race condition to get content after the onDetach()
Solution: Add protection to prevent this IllegalStateException
Bug: 239578655
Test: make RunSettingsRoboTests ROBOTEST_FILTER=OneHandedSettings
Test: Manual testing by rotating 100 times quickly
Change-Id: I0a03cf1c01cd34c8ae0b0e70c4ffc41168b18ab8
2022-08-09 02:36:59 +00:00
TreeHugger Robot
248895db72
Merge "Use setting as base activity for fingerprint"
2022-08-09 00:05:45 +00:00
Automerger Merge Worker
d7d9c9230a
Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf5534b
am: a3e8d15e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I96031df3304320359d7f65e506128ca43c26c568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:38:45 +00:00
Bill Yi
293f7ed7a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours am: 400ee96a23
-s ours am: 8491ffc957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I35c1127beff15bc404170ab7202cdae87a1d2fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:38:34 +00:00
Bill Yi
883d1f9d8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: e1617e2547
-s ours am: de8d1f362e
-s ours am: 0396db20d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I59487966a4604e4433f25f08b1d788d94d4dde98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:30:28 +00:00
Bill Yi
1541e74118
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 9a59cb4425
-s ours am: 7a6cfc59bc
-s ours am: bb70dd6d3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Id359c63ce167da978d1fdd691d99062cc21f06d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:30:22 +00:00
Bill Yi
93b8f08310
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 339f517c18
-s ours am: 4e8f9c0dbf
-s ours am: 9aeb49e969
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I74926b8c25f6f4884552e16a54f67a0ce3dffeec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:30:09 +00:00
Bill Yi
9982632d8c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 065b5806ef
-s ours am: 05199e1e03
-s ours am: 9245ecf252
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ie6aebcb32982be9173c3ec3d73d187a65734814c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:29:59 +00:00
Automerger Merge Worker
a3e8d15e45
Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf5534b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I68386ae4212ba7ee402a537d61c4a3db92e9c040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:24:40 +00:00
Bill Yi
8491ffc957
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours am: 400ee96a23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I05753b7c69cb5dbcdac71302307dc5d2fde00d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:24:24 +00:00
Bill Yi
6774f7218a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours am: 5fa5132f34
-s ours am: 6915f8d941
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I80ed7fb1075ab98a19ba8552999d9108bafc7537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:18:29 +00:00
Bill Yi
a7ccdf821c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours am: e52590665b
-s ours am: 45b42b3c77
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I8e10a2bc168cf29f463fad90434e1900035a1d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:18:19 +00:00
Bill Yi
40937d46de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours am: c6584ab4bd
-s ours am: 81c078b3a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: If541cb3c7796fec63874186508ccff59fddc3d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:18:06 +00:00
Bill Yi
0b5d1823ac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours am: af74f8dfde
-s ours am: f07c2d63dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Id0f6faf2096154be33b4d0a6791f8929d437f0a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:17:54 +00:00
Bill Yi
0396db20d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: e1617e2547
-s ours am: de8d1f362e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I82af4ad0e93c8f34e9aad6a316ef282f11ad4210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:15:38 +00:00
Bill Yi
bb70dd6d3b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 9a59cb4425
-s ours am: 7a6cfc59bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Ic3da25998d311205461b8dbcd15a7fdde9547a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:15:28 +00:00
Bill Yi
9aeb49e969
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 339f517c18
-s ours am: 4e8f9c0dbf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ib02a441a9a5610567ac55f03f7a2bccd04068e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:15:18 +00:00
Bill Yi
9245ecf252
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 065b5806ef
-s ours am: 05199e1e03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: If4386e9928b8e8d73188ddbb89f03f8fa04cca68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 15:15:01 +00:00
Bill Yi
6915f8d941
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours am: 5fa5132f34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I20bffeebf983e481fefa07f5f9b94d084142263c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:57:20 +00:00
Bill Yi
45b42b3c77
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours am: e52590665b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I2d8cd6119459b5497f8fefdd730e45581873da1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:57:12 +00:00
Bill Yi
81c078b3a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours am: c6584ab4bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ie68b8a64564112074e9df6507a4ae47a217a9f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:57:00 +00:00
Bill Yi
f07c2d63dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours am: af74f8dfde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I1b15a0b0c04e72239f6251bc51ebf02927a6a7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:56:44 +00:00
TreeHugger Robot
35f307b69d
Merge "Fix slider bar is too close to bottom problem"
2022-08-08 14:51:00 +00:00
Automerger Merge Worker
355cf5534b
Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours
2022-08-08 14:45:54 +00:00
Bill Yi
5fa5132f34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I7f188bc1b9e77d04ffdb1afd61d7531d8266ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:31 +00:00
Bill Yi
400ee96a23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I544c7dee0d3cc8a4aaa34e2d2043e38dccf05cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:25 +00:00
Bill Yi
e52590665b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I0bdafaa4f8cb1e56ff6b2ec2c7ef120c976a7cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:25 +00:00
Bill Yi
fe6ade2ec2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I231dcc9587b3aafbbbff1e4291c2ba3f2dad27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:18 +00:00
Bill Yi
c6584ab4bd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I1d0ce608a264fe5c15f4037b35f911df9ff6ead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:11 +00:00
Bill Yi
e69f1ed9f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: a3491642be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I1b19daa28c89175361d745d56cab8a4cd27571a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:08 +00:00
Bill Yi
c46f4b35fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ic6d63b2a784aad8e66dd7c3b1ebe58a54a840850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:06 +00:00
Bill Yi
52e411165f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: aa646b64f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I6efff4b97c3cae37373541e20158fd3ef3eb5cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:01 +00:00
Bill Yi
af74f8dfde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I00769191143c30e2dbaba985611c4b3ac756c478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:58 +00:00
Bill Yi
de8d1f362e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: e1617e2547
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Icda5c5c8012ea5a9fbf415b6abf8e6baa451a891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:57 +00:00
Bill Yi
7a6cfc59bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 9a59cb4425
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Ieb989bcce06b10b09a76b212948f037fb8afa702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:51 +00:00
Bill Yi
e0ac14698e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I0a421db32540c8a2f0d79b7a2f90faf4ca16c9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:51 +00:00
Bill Yi
0ba32e52db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 52d877f6f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ib2a3cf44a242412a8c963d64be7c76b84505ea42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:47 +00:00
Bill Yi
4e8f9c0dbf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 339f517c18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I381f1b7456d2d3d11cbb053aa575b2743eb092de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:38 +00:00
Bill Yi
9329cc2c2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: aba6baf22b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ifc52e914f2454438e8fcd7364647ecf0c2c7d9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:35 +00:00
Bill Yi
05199e1e03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 065b5806ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Ieddefeba6dd716c2dc47d79680cdbd276ff8360b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:24 +00:00
Bill Yi
ba8de85603
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I9f23ed66bce82323676cc2cad73d20cd5daad0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:24 +00:00
Bill Yi
e1617e2547
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Ia4467cda3be0dfe8bef977226bd7d66a5ea94243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:20 +00:00
Bill Yi
0cf4c34624
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Iabd37d4636947ec369892943d08bae76834ae5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:19 +00:00
Bill Yi
a3491642be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I1dd9b048f034497cce8670ca8239a21243020590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:15 +00:00
Bill Yi
9a59cb4425
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Iec81971e91f16fd26e37a75ad38114235259f2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:11 +00:00
Bill Yi
aa646b64f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I3c53da65aca139dc47e2204589553da16360189e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:07 +00:00
Bill Yi
4f7ff2683a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I7fac7bceb551704f9dcedc7b676dcdbfe9edbe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:05 +00:00
Bill Yi
339f517c18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I7188390127c2904eae5f1e892b327ac8e81fc2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:14:58 +00:00
Bill Yi
52d877f6f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I236896268c7fea5cdc506165ad1ea0b294323360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:14:56 +00:00