summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-12 00:34:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 00:34:41 +0000
commit0ea279e660454ef82af534baf22b65dbd20ccc93 (patch)
tree438d0c2bd301f4823681cc60b029f2c3b024d1c7 /libs/androidfw/AssetManager2.cpp
parentdcfbb73522a7112c00ad05ab9f48a702698f4967 (diff)
parenteac19a4767bb5f89ab59b53df6dd26d00977cd7d (diff)
Merge "Retire Emulator's keyboard from frameworks/base" into main am: eac19a4767
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745421 Change-Id: I9a6a9751356e8172c150f1c252d83659c1510ca5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions