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

Commit a9540d82 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Remove workaround for R class conflict in Settings unit test." into... 

Merge "Remove workaround for R class conflict in Settings unit test." into sc-dev am: fee29f30 am: 2b0813e1

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

Change-Id: Ia1ef4106eda97d8b08844645c65e6c41b77468aa
parents 9f564fb3 2b0813e1
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