Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b5acae authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove conflict window crop" into tm-dev am: 3fa5b533 am: 6d85f208 am: 393d838d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717099



Change-Id: Id92017b717f0a00aa36b37ffa192172b83224e4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 467233ff 393d838d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment