PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,743 Commits 1 Branch 0 Tags
eae581e3cebf9bd8246d43cf6160bb2602b53cdc
Commit Graph

103743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5bff9c0582 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:36:40 +00:00
TreeHugger Robot
0686cc1296 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d0019169fc 2p: 847f203c73
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:36:40 +00:00
TreeHugger Robot
dcce77a0ce Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:34:45 +00:00
TreeHugger Robot
cec5814259 Merge changes from topic "presubmit-am-64cf0a3c0b354ea4b1dd5897c8a34a8d" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:34:45 +00:00
TreeHugger Robot
887019e2ff Merge changes from topic "presubmit-am-64cf0a3c0b354ea4b1dd5897c8a34a8d" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50 2p: 27226cae62
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ac1b5fd50
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:34:45 +00:00
TreeHugger Robot
49ad55503b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I35de3648aac6fc1e15e4e7a84281fb9decc5aa00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:33:12 +00:00
Arc Wang
0c2193a8f2 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I1ab001d29927e83060cb99639e3a94d165f30a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:32:54 +00:00
TreeHugger Robot
4e9515820f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I387fd94c259dd06804534f22e876c50cac30f9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:32:10 +00:00
Arc Wang
22d0b8cf8b [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I70d40c4c64be98f21e1279a67b8578cf9df4ac9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:31:45 +00:00
TreeHugger Robot
e7a4c376fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours am: b407f5f9e2 -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: I6360852ef9180c7589201c9eca2c5f1a468299e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:26:12 +00:00
Bill Yi
2f22574178 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours am: e1e0224940 -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: Ibecf8872583476951c61727fd9072d0c237a7d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:26:11 +00:00
TreeHugger Robot
4787a7a0f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours am: 325c68c26e -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: Ifd29aa5bc7bfeb8e4c614c4a72d3e39cb26e8fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:26:03 +00:00
Bill Yi
cdf350f56c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours am: 60170e3ab0 -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: I6e90eacb8464229bfe01343303d16adbae4a9c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:26:02 +00:00
TreeHugger Robot
8e1a8e5068 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours am: 932550da08 -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: I07e4f71a15f10002bb4a5e5cfb87a0c67c003250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:25:44 +00:00
TreeHugger Robot
efbebfda1f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Ibceb4f290f2b935d417eba8b867c984170343b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:25:02 +00:00
TreeHugger Robot
19517a8a74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours am: 36f3c3c79c -s ours am: fd15f9fdd4 -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: If85b21165f9c10421c22c82b1c7a519db8047029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:24:58 +00:00
Arc Wang
2adbb69d81 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: Ifc6d835387426825f5c22e92c7120b7fa9544caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:24:56 +00:00
Bill Yi
85487f543c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours am: 738c02db59 -s ours am: 1405a87cb8 -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: Ib6cd2db381962467e3797651573fa14673168087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:24:55 +00:00
TreeHugger Robot
eb37fe4394 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Ib6f01b1895df56eb5b8d7e57cd19ddae3dfaba59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:24:45 +00:00
TreeHugger Robot
963481c225 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours am: 39e8371e7c -s ours am: e15242ce8c -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: Idb39ac0d222b2be7fded53f9c3022bba31812ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:23:32 +00:00
Bill Yi
60849169d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours am: bad45996b2 -s ours am: 9122566cd2 -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: Id90457a492ca2e46e61ce902617f8e98369133dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:23:29 +00:00
TreeHugger Robot
099ebddc45 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecb28bd73e -s ours am: 3964b99f30 -s ours am: d7564d9e6f -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: I79993f97d5e8f16ccd7d3c1819acecb008b408c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:22:43 +00:00
Bill Yi
60da8bed05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5468439c4c -s ours am: 7cb7ea1514 -s ours am: 9cbfe1b32b -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: I0ad4da14dd083c1996d70441a232baf50456c2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:22:34 +00:00
Peiyong Lin
390e95db32 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d am: 8e23b02de5 am: 43836c899d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

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

Change-Id: Ie674e9604b666e50375e984a94bf47bfc7c4a3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:21:06 +00:00
TreeHugger Robot
fd15f9fdd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours am: 3cc2f49ffc -s ours am: 36f3c3c79c -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: I195cbf230639a7529bde090a61d039e884e77804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:20:36 +00:00
Bill Yi
1405a87cb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours am: 1b10109a03 -s ours am: 738c02db59 -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: If749640486f50c991d2431a2e19639941196f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:20:35 +00:00
TreeHugger Robot
e15242ce8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours am: 03353d6449 -s ours am: 39e8371e7c -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: I0970ab5e51930fb85abcbfd3e5dff49d3926a180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:20:22 +00:00
Bill Yi
9122566cd2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours am: b447a5f3b5 -s ours am: bad45996b2 -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: Ie4c56f0026c37c6297eaa519006e0ec0e5c7c87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:20:21 +00:00
TreeHugger Robot
852c2b3c5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 467b38d5b6 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I25e6e5cd29025863f5684d0b623dd8f124efad0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:20:11 +00:00
TreeHugger Robot
36f3c3c79c [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: I75b57b7606a1be78acbe5e17c4f96c1bf65d7e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:19:37 +00:00
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