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

Commit bb54f61d 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: df15d102 

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



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