commit | 14a59c3da915ac8ba3914b5d2d0c993bfb6db657 | [log] [tgz] |
---|---|---|
author | Beth Thibodeau <ethibodeau@google.com> | Fri Nov 13 18:34:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 13 18:34:02 2020 +0000 |
tree | 4eab34015270334b3fe55169cbfce61b9abaa5aa | |
parent | 077c2b8dd29265424698550e203b858d764a7720 [diff] | |
parent | d2334491b2acea9b91454d2b9866102b05a8b0d9 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Use loadDrawableAsUser in MediaDataManager" am: dd1a016568 am: 2f163b2ba5 am: 46ecb67146 am: d2334491b2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1497098 Change-Id: I4f514dfa93b2e06dc872a8f2d8fd4cbed2af112f