Commit Graph

60459 Commits

Author SHA1 Message Date
Sunny Goyal d6207bfce8 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 0b6a764f36 am: e40d5085b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Id4ebbe8edb921f6cd6db86962d3e3fa749e9f2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:39:10 +00:00
Sunny Goyal 38e1c232e9 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 7f1b08672e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I1a9793a2f412cc25c483b7d12dad3d0e257f8a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:38:43 +00:00
Sunny Goyal 7f1b08672e Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ie0a5fd47908ddb962fbfacd7e058c76587ba9dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:52 +00:00
Sunny Goyal 5132ca8f3e Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I20cc0497fcd6f620ceb07abb096226fb32a75cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:49 +00:00
Sunny Goyal e40d5085b7 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 0b6a764f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I1a8cb72237cf31fd488406780cad12e01da96be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:17:22 +00:00
Sunny Goyal 13b5a16350 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 004fecba55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I8cffb398ec85945511ce0ca67fc6ac11e3324c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:16:37 +00:00
Sunny Goyal 3960374e68 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I0849e6bf81386a362b32eea43d0b13c6a3e9f1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:42 +00:00
Stefan Andonian 865de32778 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: 710a75e424 am: 08c44d2fe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I3912e84c3d426cfa084dccbfbdeb8101692c8337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:36 +00:00
Stefan Andonian 23f4a3a3a3 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 3801caf6cc am: cf93b70a58 am: e2c421ad38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: If80f92b930c6b4aef1ffeb6e5a49f2cf2bb64c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:15 +00:00
Stefan Andonian 395437f48b Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: d67e47294e am: 4fe7925800
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: Ibd126c900ceccd016adf9485267d1cba8e685b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:01 +00:00
Sunny Goyal 004fecba55 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: Ib45871e138168b7cdc35946a4b50cbede596e576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:01:09 +00:00
Sunny Goyal 0b6a764f36 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I3cbdc77cdb7e553cb45e742e79090563617f9951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:00:51 +00:00
Sunny Goyal c2c1fdad54 Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev 2022-06-02 16:45:31 +00:00
Stefan Andonian 08c44d2fe1 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: 710a75e424
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I3b8bc4e98a1c440f6f0d4664a66f8a0f7e341c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:31:13 +00:00
Stefan Andonian e2c421ad38 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 3801caf6cc am: cf93b70a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I6f936a25bf82c08ec7d99ab89d7600eb976ed2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:31:02 +00:00
Stefan Andonian 4fe7925800 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab am: d67e47294e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I635db33ee12f1075ff563ffe40150cdc997117df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:30:47 +00:00
Luca Zuccarini 8009c1d446 Add support for text color animations in PropertySetter.
Bug: 233223446
Test: manual
Change-Id: Id321ad7f21e804b1d1063fbe207fb783bb45f759
2022-06-02 16:11:12 +00:00
Stefan Andonian 710a75e424 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: Iff66f4e365b0554310cf5b057c7663d7e7c1f49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:10:19 +00:00
Stefan Andonian d67e47294e Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 9dd7aa50ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: If43a7b8fa1722abdc7d1c49a15cca1d7d5189bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:10:04 +00:00
Stefan Andonian cf93b70a58 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 3801caf6cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: Idb62668ee12312cacdc6d5774f07af592c15d89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:09:58 +00:00
Stefan Andonian 9e0e2e79d5 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67 am: 195683ac79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I5f44bfdab82ec94ff277d5c625bb6f23ed754d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 16:09:22 +00:00
Stefan Andonian 9dd7aa50ab Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I8b8a214b0e9a2eb64f3ecc1762a3a6b47d05a03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 15:53:50 +00:00
Stefan Andonian 195683ac79 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: Ic0fc920027a8873ad758febb6728b2f6912071c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 15:52:56 +00:00
Stefan Andonian 3801caf6cc Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I58f982aff0c82aaae99b1a9acface57dd605340f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 15:52:31 +00:00
Stefan Andonian 0c809bbe67 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev 2022-06-02 15:33:45 +00:00
Tracy Zhou 768f33f96f Merge "Tune floating rotation button size" into tm-qpr-dev am: 064f3ef103 am: 436fcdc4ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18661670

Change-Id: I3be71128ef1ce18c9d19a8dd070cefed6dcf35dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 08:35:54 +00:00
Tracy Zhou 436fcdc4ff Merge "Tune floating rotation button size" into tm-qpr-dev am: 064f3ef103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18661670

Change-Id: I430b349515af32159a92b553572680d27cb1995c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 08:02:18 +00:00
Tracy Zhou 064f3ef103 Merge "Tune floating rotation button size" into tm-qpr-dev 2022-06-02 07:59:46 +00:00
Automerger Merge Worker 943292990a Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp am: 5454c4565c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I4178845e371546191cba9e2a0f1c0b0fdb7028fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:59:00 +00:00
TreeHugger Robot 5fddef4d3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours am: 346b96b573 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73e247cf0178c4c343ef9a1c633e66f45f094fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:58:47 +00:00
TreeHugger Robot 04b597761f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: c019433108 -s ours am: 44ed53f7a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic475cdca5559198246276f9e092cea46bf2d453d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:53:31 +00:00
Bill Yi d2bf48a22c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 6c4c2c3b65 -s ours am: dd767d9245 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1bb50fa8d12f3d1dfe0806fcbbbb97104c59e313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:53:14 +00:00
TreeHugger Robot d246a83e85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: ef435f23b9 -s ours am: 9105ac392e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63136c05a9921c1da80f5628c38b6ea5995bf3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:52:56 +00:00
Bill Yi 1d61d09847 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: a613fd1466 -s ours am: 27e5b308b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If76951a9bd06fd150bd9d813af04ea2f5965fedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:52:41 +00:00
Automerger Merge Worker 5454c4565c Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 819fcee097 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: 05bc7ab50c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: 9a3d5e3f1f -s ours
2022-06-02 06:30:25 +00:00
TreeHugger Robot 346b96b573 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f6609ac3d5da2e9f109148007598ee2d27a4f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:29:24 +00:00
Bill Yi a158e7b6a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 819fcee097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba68cfb103dcd00fa4cd012f347912af3805e91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:29:05 +00:00
TreeHugger Robot b379fa8f74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: 05bc7ab50c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I461a6845b61030f8a7b1598f82051e0aaa5da80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:48 +00:00
TreeHugger Robot 44ed53f7a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: c019433108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I745773d6ffcac74539ea24721bb1211335540b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:41 +00:00
Bill Yi 28177debe0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: 9a3d5e3f1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb587877ebe7e799426212be4a7e44f3faa2aba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:33 +00:00
Bill Yi dd767d9245 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 6c4c2c3b65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02d196250c083ac706bc9410391dd241fd5cb6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:24 +00:00
TreeHugger Robot 9105ac392e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: ef435f23b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8927692c2d1deafa130e6411140b638c371f6b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:06 +00:00
Bill Yi 27e5b308b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: a613fd1466 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icceb92e3f8d64045b0f8afbb571e04ef6910a755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:27:51 +00:00
TreeHugger Robot 99c381b993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibac1867d5932e3137e96df0a4f678cba1499fd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:48 +00:00
TreeHugger Robot c019433108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d2b5087a6fcca71576720e09ba08361d63a8d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:48 +00:00
Bill Yi 819fcee097 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I574fa112a777f335375fb58d4209f51e021dd415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:28 +00:00
Bill Yi 6c4c2c3b65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30dd7c97f5d5789d219a0fd2ce5a7c34998a05bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:28 +00:00
TreeHugger Robot 05bc7ab50c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I005992eef74f7320d46300c71dc6fb8841014aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:12 +00:00
TreeHugger Robot ef435f23b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc58f4c3d3c34c8533cca430d5cba36f0bcc274a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:12 +00:00
Bill Yi 9a3d5e3f1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aa779e0d265368e2eadaae29d2c637002bbfb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:06:58 +00:00