Commit Graph

103262 Commits

Author SHA1 Message Date
TreeHugger Robot
d7564d9e6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours am: 3964b99f30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62b289d3ca17db68cb5f0742936ff4e6e38c88a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:35 +00:00
Bill Yi
738c02db59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5c1401fd5ffa72042366fa89219e64b2cf401f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:35 +00:00
Bill Yi
9cbfe1b32b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5468439c4c -s ours am: 7cb7ea1514 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I826aae8414598c74157941b41bf1ab849bccddd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:34 +00:00
TreeHugger Robot
39e8371e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5daa291faf003cde51ae8c40d8ef3ffb5655494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:29 +00:00
Bill Yi
bad45996b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea3a324200d2776651f7ad67f5934706998498d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:28 +00:00
Peiyong Lin
43836c899d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d am: 8e23b02de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I5e8699df844aef4b3169bdc4b59643205b1cd5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:25 +00:00
Chaohui Wang
0811fb1f11 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee am: 2e5180884a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I30fe182712af3f38ccca547be103e5292db38da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:19:18 +00:00
TreeHugger Robot
b407f5f9e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd0304529f8f337b90cc9c5e3440eb8dc4f8f958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:41 +00:00
Bill Yi
e1e0224940 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I790fd5c3a88a6134102868ed939db45519414a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:40 +00:00
TreeHugger Robot
325c68c26e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49f93ec8939a212f3d3ecb8489dc2d37ac825a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:33 +00:00
Bill Yi
60170e3ab0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94a5a02665caea3d7d0b06747a369ca16ed79ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:32 +00:00
TreeHugger Robot
58ed75de8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0f949ed72b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0332e8c15cdd25e8e9befaa7dc3ae5ceb896a886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:21 +00:00
Bill Yi
66458d1ff1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3bc0251d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c425decd683d238ff01dd559e208ebfb2d5d51d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:20 +00:00
TreeHugger Robot
3964b99f30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47a0a5526d8e6ee1c5851bae00a90c54d38efc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:16 +00:00
Bill Yi
7cb7ea1514 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5468439c4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d400413d41e847b9c07f588f448729d732b57ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:09 +00:00
TreeHugger Robot
932550da08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f74bf4bb40f2fdeed2eaf4c4ff6e57f8a044d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:18:06 +00:00
TreeHugger Robot
4c7a5da05e Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod am: 6b7c737c5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637730

Change-Id: I8579ad5033c3a29e9a13783af6520761f315e20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:42 +00:00
Peiyong Lin
d68db1acfd Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d am: f38e00f223
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: Ib0c1464702b777b2d4d37a4b4d996b43ae0a06e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:33 +00:00
TreeHugger Robot
3cc2f49ffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I697483b01380c9a58968aaaf3f05b73c52bef72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:25 +00:00
Chaohui Wang
0bee8b57c4 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee am: 1aebd5fb02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: Ia850d51dec2cc813a65928ef12c6edcccfbe245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:25 +00:00
Bill Yi
1b10109a03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibab16e0884b63f27be3b3e318b3aacfa46fb460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:16 +00:00
Peiyong Lin
630f705b0d Merge changes from topic "remove_game_dashboard" into tm-mainline-prod am: c3ce36da27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I63531ddd3b4222de5d31c88b2957ed83592c0c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:11:08 +00:00
TreeHugger Robot
03353d6449 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6192a7567342f40e2dfb0816ac5dfa9f8fa2e9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:58 +00:00
Bill Yi
b447a5f3b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61bf8ed909c9483c9a1fa836dfe54d1c9cdcaf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:48 +00:00
TreeHugger Robot
1fef2284af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a18724de22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15b3f50983b18266e4f76773d96536ad37cf7c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:39 +00:00
Bill Yi
cce866c288 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ed1350a4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb47b65b98f5890420f7504d621018643e683fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:10:25 +00:00
TreeHugger Robot
467b38d5b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:10:06 +00:00
TreeHugger Robot
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
TreeHugger Robot
ecb28bd73e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:05:07 +00:00
TreeHugger Robot
6b7c737c5e Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:05:07 +00:00
TreeHugger Robot
58ddf22f1b Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c 2p: 64ad35274d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:05:07 +00:00
TreeHugger Robot
0f949ed72b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:02:44 +00:00
TreeHugger Robot
fe1b272192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a -s ours am: 793846e887 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2bcf231ff4954cdcc17b580a7fc0991ccd82cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:56:42 +00:00
Bill Yi
3a88f75a1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d -s ours am: 10b4940a2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0264ec468d3d04e5eb929b47d17d5fcaf9689d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:56:40 +00:00
TreeHugger Robot
d7ed1d1500 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a -s ours am: 9e81a99857 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79233821f1fe0f3e1c12c6e81696ab7ecdbdd960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:57 +00:00
Bill Yi
d2be3e1040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75 -s ours am: 90f845a535 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I157a53456b2171ab7587a26177fab29166ade494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:56 +00:00
Peiyong Lin
8e23b02de5 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:54 +00:00
Chaohui Wang
2e5180884a Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:08 +00:00
Peiyong Lin
f38e00f223 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I50773da7dafbdde67ff5ace7bc5fb15a3e16f024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:00 +00:00
Chaohui Wang
1aebd5fb02 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:54:53 +00:00
Peiyong Lin
c3ce36da27 Merge changes from topic "remove_game_dashboard" into tm-mainline-prod
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
2022-04-07 17:48:18 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
Peiyong Lin
a4f590f1f1 Merge changes from topic "remove_game_dashboard"
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
2022-04-07 17:48:18 +00:00
TreeHugger Robot
6336dc03b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:35 +00:00
TreeHugger Robot
ce51beb64d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:13 +00:00
TreeHugger Robot
a18724de22 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 17:40:11 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
TreeHugger Robot
cc6286ba03 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-07 17:27:32 +00:00
TreeHugger Robot
793846e887 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I797acd66aa4acb7b39a8d84cc068120301b4a40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:25:36 +00:00
Bill Yi
10b4940a2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7171f6e0493773705bff5ccabac56d8bb6ecbec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:25:29 +00:00