Joshua
76ca8923ab
Add JobScheduler support in factor controller
...
Initializes the JobScheduler constants string in Global Settings and
takes it through the parsing of creating a map with the key:value pairs
linked to the JobScheduler policy. Also changes the way the getter
methods work to take a factor policy so we can know what policy to
change.
Bug: 195056296
Bug: 195056102
Bug: 195055895
Test: Manual
Change-Id: Id82101b2a045dd14bb8eacfbe51c363b4bafb1ce
2021-08-13 23:44:59 +00:00
Alex Salo
ec94cff0f6
Merge "Add toggle switch for auto rotate preference in display settings."
2021-08-13 23:24:18 +00:00
TreeHugger Robot
df442a7a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: 0af8e8e5cd
-s ours am: 17a08343bf
-s ours am: 146e5545ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: I0b0b534383cc9f12d20621f4bbdcc6726e8cadb2
2021-08-13 22:53:35 +00:00
Bill Yi
a9388a6f42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: 15bb8d9aae
-s ours am: 6e95702bd8
-s ours am: 005b4f57a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Id2b14f24bc37cfe68ccd4558550bd3e3f048515e
2021-08-13 22:53:23 +00:00
TreeHugger Robot
440007d2de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: e51ac2563b
-s ours am: 69f2f00362
-s ours am: d645a1cd93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: I0eb158becbb305e2e740f0503d8f22201f9b530e
2021-08-13 22:53:05 +00:00
Bill Yi
96ada3a832
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: c23385ba9c
-s ours am: 8e53fa2ae0
-s ours am: 07c3ce6345
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Ia5b93a160017bbb3fb2fad39b36684b29151c5fa
2021-08-13 22:52:46 +00:00
TreeHugger Robot
d8d36fb56b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: cc5b59c9a4
-s ours am: 32cf5641ea
-s ours am: 4a59379253
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ic14262213423b215ff9374fd58d9a603d924fe18
2021-08-13 22:52:24 +00:00
TreeHugger Robot
a585f43503
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 7508bd0cd2
-s ours am: 37dde5b3df
-s ours am: 3f94586dbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I96f7a2c2689c377b84afe0f42343101cdf5695cb
2021-08-13 22:52:03 +00:00
TreeHugger Robot
8143cf3bd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 96bd289bf7
-s ours am: dcd45dca23
-s ours am: ea855b2730
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I480f1f3544b939d794031bd73555be2500fffae5
2021-08-13 22:51:40 +00:00
TreeHugger Robot
db5c82b443
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: bd1e418efc
-s ours am: d7c6436ea4
-s ours am: 360cfb2b6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I943c1c043483ca3b9573f2f7ee4b7a7455af9816
2021-08-13 22:51:22 +00:00
TreeHugger Robot
af5c682741
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 652c469f3e
-s ours am: edcd71932d
-s ours am: e583bf989f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I15531968f4c1e69a2c21fe25ac784f605c9e9ed6
2021-08-13 22:50:50 +00:00
TreeHugger Robot
ad46b427a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 612fb2cb80
-s ours am: 4ea6925fef
-s ours am: f99c370e3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Icf5510d187a40b977b7f08d4b9ad5e04b4a93170
2021-08-13 22:50:10 +00:00
TreeHugger Robot
61ef34b94a
Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0
am: bffa291613
am: 2354bb5b95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ife9f5aa34850df5410ed735d2db41bd13c301984
2021-08-13 22:49:42 +00:00
Bill Yi
801746d469
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
am: f13f8b9065
-s ours am: 9a2aa2693b
-s ours am: 7fcd3e9c0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Iadb4cb025803b81af77b33619d82414a9bb084e5
2021-08-13 22:49:39 +00:00
TreeHugger Robot
b150f31d39
Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f
am: 3759660383
am: 739ee8ed8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I523e47fac345e6acda05d4cf13b97b39bf4c0a91
2021-08-13 22:49:01 +00:00
Bill Yi
6de25d5671
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
am: f13d3514ec
-s ours am: 4948e577ec
-s ours am: 4cccd4bd25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Ie80b94a2b1f2c14903fca4fe765e4b6b0a1d97be
2021-08-13 22:49:00 +00:00
TreeHugger Robot
17e3f28bb4
Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c
am: a755975337
am: 4559f1ee53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I22e51d2ea712e52c80cf53f94a023025d23ba234
2021-08-13 22:47:55 +00:00
Bill Yi
da501b8236
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
am: db32ad43da
-s ours am: 329d98ec28
-s ours am: 19188d6524
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Id82b50b6a73bb0fc4e2fecc5e4e159f68aa5c21d
2021-08-13 22:47:53 +00:00
TreeHugger Robot
07af710ef1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours am: ede03fcc17
-s ours am: de4d5cb3f9
-s ours am: 693cecdc4f
-s ours am: a3d5a8aef5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I27611e7cabf4c2802602a2f98eceaa522d5dee54
2021-08-13 22:46:06 +00:00
Bill Yi
8c1c3dac08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours am: 7eb41e014f
-s ours am: 4a7acc1636
-s ours am: b03c6ba2ca
-s ours am: cc4d8d8668
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: Ica057892a707ab21ec7a6fb4bd7a46c357386782
2021-08-13 22:43:44 +00:00
TreeHugger Robot
222cc5dc06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: 0af8e8e5cd
-s ours am: 58140cecab
-s ours am: c219d7aeb5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Ie835ded1df6b307e26a0fb85febf7fbfaede4421
2021-08-13 22:36:34 +00:00
Bill Yi
40422025f9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: 15bb8d9aae
-s ours am: 1fe622ea84
-s ours am: 3696b7f734
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: I6338029aeec4b89cf8be4c602d4341fea4acae6f
2021-08-13 22:35:18 +00:00
TreeHugger Robot
65a3ac3f86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: cc5b59c9a4
-s ours am: 5af512fa91
-s ours am: 71cb764e1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: If26e1ba0085f160d0dd105b3575cb97da995959e
2021-08-13 22:33:47 +00:00
TreeHugger Robot
aeb67af63a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 7508bd0cd2
-s ours am: 40094149eb
-s ours am: 29fa1d02b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Ibeabc1f6eb5495042d65fef00f7384f748c249d1
2021-08-13 22:32:00 +00:00
TreeHugger Robot
06b9581822
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 96bd289bf7
-s ours am: 1add1250a0
-s ours am: 3fc13ba9f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I281e3e798b0d457e1e9a392358857ffeecba4036
2021-08-13 22:27:58 +00:00
TreeHugger Robot
74f50ae570
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours am: ede03fcc17
-s ours am: de4d5cb3f9
-s ours am: e5bdfacb0f
-s ours am: fe687b44c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I3bf931fcb14dda07fc92da10d7ae15750ef35443
2021-08-13 22:25:30 +00:00
Bill Yi
4e7270d232
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours am: 7eb41e014f
-s ours am: 4a7acc1636
-s ours am: 4310165e62
-s ours am: ca04371b27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I6f5940b88cf36fdbb6e2ce27dbe90f9b0f75db22
2021-08-13 22:23:32 +00:00
TreeHugger Robot
146e5545ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: 0af8e8e5cd
-s ours am: 17a08343bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: I5d8c19007fce2f892801e3200f1cd2929a19ba92
2021-08-13 22:23:27 +00:00
Bill Yi
005b4f57a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: 15bb8d9aae
-s ours am: 6e95702bd8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Iefe3bcc2b3aa0675d053711813d147e1c8167819
2021-08-13 22:23:06 +00:00
TreeHugger Robot
d645a1cd93
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: e51ac2563b
-s ours am: 69f2f00362
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Ibbb8659161fb436c41a7ecffdd7df66dd30c41e7
2021-08-13 22:22:49 +00:00
Bill Yi
07c3ce6345
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: c23385ba9c
-s ours am: 8e53fa2ae0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Iecb6154e1f17623f61ef3ed09bff6888a63680c0
2021-08-13 22:22:38 +00:00
TreeHugger Robot
4a59379253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: cc5b59c9a4
-s ours am: 32cf5641ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Id6d88612981dce25921c662f0d55253d704123cf
2021-08-13 22:22:18 +00:00
TreeHugger Robot
3f94586dbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 7508bd0cd2
-s ours am: 37dde5b3df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I6e821d28135a5f6dbedd43441cdd52e13ba0277a
2021-08-13 22:21:53 +00:00
TreeHugger Robot
401b3fd7ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e4e2fb715f
-s ours am: a910c6c52d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551906
Change-Id: Id2fb16e358dcd8e856f2b6f5cd66f57ddd65e98f
2021-08-13 22:20:51 +00:00
TreeHugger Robot
ea855b2730
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 96bd289bf7
-s ours am: dcd45dca23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I61f0c3d356345465aa7983e9ed0c56038a6e97c2
2021-08-13 22:18:29 +00:00
TreeHugger Robot
3d2be5989d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours am: ede03fcc17
-s ours am: e245bf8e66
-s ours am: e4de411880
-s ours am: ca1bbb9f09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I69147985f88044370632e33fd27045fc3b3b365f
2021-08-13 22:18:19 +00:00
TreeHugger Robot
360cfb2b6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: bd1e418efc
-s ours am: d7c6436ea4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I91fb2451d637f3fddd5c710aafb9f816ee51e1f5
2021-08-13 22:18:13 +00:00
TreeHugger Robot
e583bf989f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9
-s ours am: 652c469f3e
-s ours am: edcd71932d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I28ab402557c86ee118fc5f945575a060dedd713b
2021-08-13 22:17:57 +00:00
TreeHugger Robot
f99c370e3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c
-s ours am: 612fb2cb80
-s ours am: 4ea6925fef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I4d82fab1c5b79caba281a1f37fee294e00bcdecb
2021-08-13 22:17:29 +00:00
TreeHugger Robot
2354bb5b95
Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0
am: bffa291613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ic8e740912bff55bac6b73d6bfb19d08a2e2cd0e2
2021-08-13 22:17:04 +00:00
Bill Yi
7fcd3e9c0c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
am: f13f8b9065
-s ours am: 9a2aa2693b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ia89edff655a74eac52ddcbd8951b4452ebe34030
2021-08-13 22:17:02 +00:00
TreeHugger Robot
739ee8ed8c
Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f
am: 3759660383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I6f73c158b57e6fdd8be98444b10d42c5200dbea4
2021-08-13 22:15:49 +00:00
Bill Yi
4cccd4bd25
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
am: f13d3514ec
-s ours am: 4948e577ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Icd5bb899448a01828a342c7bb66c5e612c93d68f
2021-08-13 22:15:48 +00:00
TreeHugger Robot
4559f1ee53
Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c
am: a755975337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Ia0f69c8fb9cccde5cd4c9712d7f7b835ff5aacd3
2021-08-13 22:11:36 +00:00
Bill Yi
19188d6524
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
am: db32ad43da
-s ours am: 329d98ec28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I69b61a5f40f079f99193668efb0e6a3bf816c869
2021-08-13 22:11:35 +00:00
TreeHugger Robot
a3d5a8aef5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours am: ede03fcc17
-s ours am: de4d5cb3f9
-s ours am: 693cecdc4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I4a2932287a412be9f011c49ae9c1f5f51ef4b8fa
2021-08-13 22:10:30 +00:00
Bill Yi
cc4d8d8668
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours am: 7eb41e014f
-s ours am: 4a7acc1636
-s ours am: b03c6ba2ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I30d8b170bc069ce4ec24b7222846c0bbbad9931b
2021-08-13 22:06:51 +00:00
TreeHugger Robot
c219d7aeb5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours am: d3a02937ce
-s ours am: 0af8e8e5cd
-s ours am: 58140cecab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Iccae6abaf90c3ac5d8c3bb55751029fce279ae2b
2021-08-13 22:05:16 +00:00
Bill Yi
3696b7f734
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours am: 04c33bbf71
-s ours am: 15bb8d9aae
-s ours am: 1fe622ea84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: If6d6bd58da2642c2499203284dcaf8ce33037674
2021-08-13 22:05:05 +00:00
TreeHugger Robot
71cb764e1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9
-s ours am: cc5b59c9a4
-s ours am: 5af512fa91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I21f4ae8c8745c62eb1bd9072d33cbfb53f7ee539
2021-08-13 22:04:48 +00:00