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

Skip to content
Commit 03785dc3 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 am: 7647712c 

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



Change-Id: I0534b89e5187f0c8611b19f9baca8b4cc5db17d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f98044c 7647712c
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