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

Skip to content
Commit 6d85f208 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 

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



Change-Id: Id402652dbea7f6cabdadf4c0b9982935d61dda8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3099215b 3fa5b533
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment