summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Anvesh Renikindi <renikindi@google.com> 2023-09-13 17:17:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 17:17:00 +0000
commit4d311e76cc8b65d737b71daf36cd034c916a804a (patch)
tree9e6f33dbdf5aa5b9c68ed2929f4c733d34bb5aa4 /libs/androidfw/AssetManager.cpp
parentf80d14878b31b958fe895ec4288bd28bc3f1e5a6 (diff)
parent562eabae75ef0a9087d87e0735b903c0e5d3b1e4 (diff)
[automerger skipped] Revert^2 "Lifecycle has to use kotlin syntax" am: 562eabae75 -s ours
am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 280994a57c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24734309 Change-Id: Ic49527bdc72bae96ef2a1e3ee95a6c5482ede285 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions