PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,459 Commits 1 Branch 0 Tags
4f69ca52efa7a94de67a2b9c4956e233dfb23d92
Commit Graph

60459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi 6eb26b0a05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa9f6501e9 -s ours am: 32b6c9a7c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2177b97fc46324fa9dcfade257bc8da7dca9c71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:04:14 +00:00
Schneider Victor-tulias 1de966d0f5 Fix All set activity not drawing on initial swipe. am: 4d18da78c0 am: 97cda0dea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18930603

Change-Id: I3c80d8966f9fa923fedca4432c1d8349d44177ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:03:59 +00:00
Bill Yi e8c2f732af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f3de2bbb2 -s ours am: 0af362b380 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3983ae06735646b6d79e12834d15e9fa9770791d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:02:40 +00:00
Bill Yi 2361d4c68a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f3de2bbb2 -s ours am: d6ac82b18c -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I889ef5d9b0d9853a6bd0e56de42a0af1c7277f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:34:14 +00:00
Schneider Victor-tulias 3a126d78a9 Fix All set activity not drawing on initial swipe. am: 4d18da78c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18930603

Change-Id: I71eea3ff4b66ec094a7eb451d1a0afe3cd3a7227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:34:03 +00:00
Bill Yi 32b6c9a7c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa9f6501e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb456e46ed9287eba5e10e88b833047b1e4604de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:33:26 +00:00
Schneider Victor-tulias 97cda0dea3 Fix All set activity not drawing on initial swipe. am: 4d18da78c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18930603

Change-Id: I3090657e1da549004ad1586a34aad129570d4475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:33:14 +00:00
Bill Yi 348e0b84e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa9f6501e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida16b353b851e4e5775874deab4f10fd32a18333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:31:57 +00:00
Schneider Victor-tulias c4831dbd10 Fix All set activity not drawing on initial swipe. am: 4d18da78c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18930603

Change-Id: I11b034bb911935e7eaf1373c3a4e2c667c0922d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:31:46 +00:00
Bill Yi 0af362b380 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f3de2bbb2 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I6e567a6e3220d934a3df6cc1745a4008240caac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:24:19 +00:00
Bill Yi 9f3de2bbb2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3fa536c9f10b1648155ed3ef01cfb5d95e20fb34
 2022-06-19 09:05:18 -07:00
Bill Yi cba7d722c4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibf3c81237de9f9fe20f590d01483dc9283313fb6
 2022-06-19 09:04:33 -07:00
Bill Yi fa9f6501e9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I010fafdf9fc78b15763a183684aa0ab77ee66281
 2022-06-19 09:03:48 -07:00
Bill Yi 965bcbd3b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba21dae2b3170079b5e7a9b7324b6c68c073a722
 2022-06-19 09:03:01 -07:00
Bill Yi dd44423c3f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5d8815a46e2981f5ad1bf173c3903764062cf4f4
 2022-06-18 22:35:57 -07:00
Android Build Coastguard Worker 570da68338 Snap for 8740412 from 4d18da78c0 to tm-release 
Change-Id: Ia243aa33d254bc81efa5a404e1fbcc2f56bf1ed8
 2022-06-18 01:24:15 +00:00
Treehugger Robot d0c68be6c4 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours am: 3026557289 -s ours am: 77e49c7f7c -s ours am: cccae0705f -s ours am: f5a03fc920 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5317228449cce3a7d61ac45fa372ab878963a766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:58:38 +00:00
Xin Li 29aee68c00 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours am: c86ee8679e -s ours am: ba8b04da38 -s ours am: c21ef09037 -s ours am: d918fdadc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied30c1df436124238166c2dfac6f6738e93edf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:57:47 +00:00
Treehugger Robot f5a03fc920 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours am: 3026557289 -s ours am: 77e49c7f7c -s ours am: cccae0705f -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: Ibf7cc3380144be168ce3db6b60d6731ea3d56d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:32:50 +00:00
Xin Li d918fdadc6 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours am: c86ee8679e -s ours am: ba8b04da38 -s ours am: c21ef09037 -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: I314b048b3ba2065c5e701ec0ccdc3152a1f023a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:32:01 +00:00
Treehugger Robot cccae0705f [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours am: 3026557289 -s ours am: 77e49c7f7c -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: Ic3ecb490711459d9d3e0189dc99e158feb95f6e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:03:22 +00:00
Xin Li c21ef09037 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours am: c86ee8679e -s ours am: ba8b04da38 -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: I49103be5e0132bd9fe9a105029de065fe2cd53f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:02:32 +00:00
Automerger Merge Worker e5090b2ce3 Merge changes from topic "am-5002014ebb8b441598ed6236bec5d938" 
* changes:
  [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours am: b314dcd43c -s ours am: 99de04debf -s ours
  [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours am: 2d19a4a4d3 -s ours am: 094417879f -s ours
 2022-06-17 21:37:27 +00:00
Sukesh Ram 521daeb05d Merge "Add app predictions to secondary display app drawer & fix tab UI." 2022-06-17 21:36:46 +00:00
Xin Li 3bc25e56f7 [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours am: b314dcd43c -s ours am: 99de04debf -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: I91b6878636fa8f8a1cc925d0bd4950eeb86b45ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:34:31 +00:00
Xin Li 7637eba18f [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours am: 2d19a4a4d3 -s ours am: 094417879f -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: I85053a12a132be18fa6934630cd73bb8b40360bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:33:26 +00:00
Treehugger Robot 77e49c7f7c [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours am: 3026557289 -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: I0247ab5b4757b7dcb883fee826b16240526a4dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:28:13 +00:00
Xin Li ba8b04da38 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours am: c86ee8679e -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: I6d822aa4aa7b1b87963409dd7c07136513837639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:27:24 +00:00
Xin Li 99de04debf [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours am: b314dcd43c -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: If18213cced4956da146112556d8f2b6c1186151b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:53:39 +00:00
Xin Li 094417879f [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours am: 2d19a4a4d3 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: Iac01c1891ddd886fe2bbefd901e93b52950bc19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:34 +00:00
Treehugger Robot 3026557289 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: Ib2b81d4659a011455987532c6da8f7ffa9429cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:07:15 +00:00
Xin Li c86ee8679e [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours 
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

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

Change-Id: I5101814b95e7e28ab9748929f72516a3fe321bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:06:27 +00:00
Xin Li b314dcd43c [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: Ibd22e011c8959daf00ab4f5de64ee374d2ddf8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:57:21 +00:00
Xin Li 2d19a4a4d3 [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: I125e70fc5f25a16caddabbdd4f39e467e38db386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:16 +00:00
Ronish Kalia 45ed73d955 Merge "Change access from private to protected for OverlayEdgeEffect vars" 2022-06-17 17:33:28 +00:00
Treehugger Robot 42b2895370 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:00 +00:00
Alex Chau b065b4b05a Revert "Add logs for InvariantDeviceProfile.getDeviceProfile" 
This reverts commit d3e8cc40b4.

Reason for revert: b/231312158 is fixed, log is no longer needed
Fix: 231851651

Change-Id: I3ea8b9d14e7eb6f8f9c794c5d15cdfc94153d392
 2022-06-17 09:36:00 +00:00
Xin Li 42a11f83c9 DO NOT MERGE - Skip SQ3A.220605.009 
Bug: 236045730
Merged-In: I310e7924c7767b24b697fc96a098b37db4cf1216
Change-Id: I87f8349c2e54cbee2765806afd646545780975be
 2022-06-16 22:50:45 -07:00
Android Build Coastguard Worker 6b6aa00fd0 Snap for 8736075 from 2545f45a1f to tm-qpr1-release 
Change-Id: Ic71251ef93f2ede65d2238379287f932008db746
 2022-06-17 01:24:37 +00:00
Xin Li 30b95a6741 [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: I90ed6ba7d25c41a3fbbc19bca6a3706b8aa756cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:17 +00:00
Xin Li 0e1fc6e6c8 [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: Id132417e04a26ea756d3513d3d35201f26b3d29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:11 +00:00
Android Build Coastguard Worker 4a9a2df869 Snap for 8735997 from 9d5f64adf1 to tm-release 
Change-Id: Ib0d762c2aa540e645f26df962cc4397c21fe5eee
 2022-06-16 23:33:16 +00:00
Sunny Goyal bbad97e273 Unifying scroll calculation logic for both widgets and apps recycler view 
Also using itemType instead of item object for widget size cache

Bug: 234008165
Test: Verified on device
Change-Id: Ia4b4a00a11627c0c454e4a699570e8ab1667a390
 2022-06-16 16:03:37 -07:00
Sukesh Ram 9e5fe63a22 Add app predictions to secondary display app drawer & fix tab UI. 
Bug: 233926067
Test: Manual
Change-Id: I2f45a4b30964b365bf149e8864a3af2ea909a237
 2022-06-16 22:44:24 +00:00
Schneider Victor-tulias 4d18da78c0 Fix All set activity not drawing on initial swipe. 
The launcher was not properly preloading upon launching the All Set Activity. The Launcher would only start loading once the user started swiping up. This would stop the all set activity from drawing.

Test: Factory reset with a restore and tested the all set page.
Fixes: 234536107
Change-Id: I6bcb805ea6c43fb993f2b57499444ea62bcc37e1
 2022-06-16 20:38:24 +00:00
Xin Li 3ccbee4558 [automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: Ie121b3b4dac24334fa93f18390033ce3d63b0277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:58:15 +00:00
Xin Li 7d8d41ac47 [automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours 
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history

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

Change-Id: I701c3c0ddb6afd4c6e472b4fc43b80c5e0e67a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:03 +00:00
Xin Li 250f92bbe0 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00