summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Xiaowen Lei <xilei@google.com> 2022-10-05 17:28:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 17:28:46 +0000
commite7d25006b6dc51c47d2c632ec6f0895d5c37ecd4 (patch)
tree4f0d83bb9eb861b75f7f32707a307d0e403f3cd4 /libs/androidfw/AssetsProvider.cpp
parent4e8f01cbde8f5a63a308cd3efb20409509a2f4a2 (diff)
parentd01e44a5170ce61aa53b922b8c4c577d880be6ef (diff)
[automerger skipped] Merge "Remove redundant MediaPlayerData.getMediaData(...) method." into tm-qpr-dev am: 037216830b am: d01e44a517 -s ours
am skip reason: Merged-In Icc7abc6825378599534578458e64615fae13479e with SHA-1 f18bf6adef is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992048 Change-Id: I351ff625bdbbdbd28bf23c2cc15bcef6af279260 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