Skip to content
Commit 14a59c3d authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[DO NOT MERGE] Use loadDrawableAsUser in... 

[automerger skipped] Merge "[DO NOT MERGE] Use loadDrawableAsUser in MediaDataManager" am: dd1a0165 am: 2f163b2b am: 46ecb671 am: d2334491 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4f514dfa93b2e06dc872a8f2d8fd4cbed2af112f
parents 077c2b8d d2334491
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