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

Skip to content
Commit 2b0813e1 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: I474863e2bf1b0b3e9119c868abbb48b064209b4c
parents 9cb3893d fee29f30
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