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

Commit 5e55f614 authored by Iván Budnik's avatar Iván Budnik Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of ef33f4c1 to tm-dev... 

resolve merge conflicts of ef33f4c1 to tm-dev am: 7647712c am: 60361a11

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



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