Skip to content
Commit fee29f30 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

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

parents cccaa5a9 4d01a45c
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