summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2022-12-07 23:54:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-07 23:54:52 +0000
commite4c4a6282595e52e879026e67217ca6a1e744a45 (patch)
tree31a96158ae4185264831a3f7e78e53c87725dae8 /libs/androidfw/AssetsProvider.cpp
parentea2cd92c1221822562f2835110bbfb6b46ed21f9 (diff)
parent54b4332901fb99693238e7d5e0db1f43960d5d56 (diff)
[automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d am: 03b55f7fa7 -s ours am: 1c9f506912 -s ours am: 54b4332901 -s ours
am skip reason: Merged-In I963afcf4ba0fd8c2e9ebca4d634098f63454fab6 with SHA-1 90a5f092f1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552467 Change-Id: I00debaba5a46a3c7f3417a8cc52fc2acfc7c64dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions