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

Commit 393d838d 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 

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



Change-Id: I54a5b2e273514c8cf7636f3d229de3ad55896b9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e432522c 6d85f208
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