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

Skip to content
Commit 60361a11 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: Ia4a523c338232f703aa59b61f3ad4cd2ba9bc4c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a23c94a 7647712c
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