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

Commit acfeda84 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 7d94276c to... 

Merge "resolve merge conflicts of 7d94276c to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1
parents 1a425310 32aea70b
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