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

Commit a2948d62 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 sc-dev am: fee29f30 

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

Change-Id: If2e5507ba53fb966216ca368b76b3b2c207ad485
parents 90078833 fee29f30
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