Commit 4ed25f51 authored by Michael Rosenfeld's avatar Michael Rosenfeld Committed by android-build-merger
Browse files

[automerger skipped] Merge "Fallback to androidx if android.support isn't... 

[automerger skipped] Merge "Fallback to androidx if android.support isn't registered." am: 1b487656 am: 2e5f10e8
am: 2eea9d4f  -s ours

Change-Id: Id543cb2f8477813b88702fc0066b8198d5ffdda7
parents 25a75afc 2eea9d4f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment