summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Dmitri Plotnikov <dplotnikov@google.com> 2023-08-12 02:06:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-12 02:06:57 +0000
commitf59bd4e197c63e4dd772e364cabdc848a0a70dd0 (patch)
tree9ca7ff4fe906c467def21bccced6d365b66465cf /libs/androidfw/AssetManager2.cpp
parent4b17ee17b530de1e784ff31641080907a44d2320 (diff)
parent004f1f8d179c8badb37747f217491398e9120437 (diff)
Merge "Assert type of 16-bit value in MultiStateCounter parcelables" into udc-dev am: a07255e755 am: 004f1f8d17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23698712 Change-Id: Id825c1db45e0bc98a9046b3b7a64d5c819aa504c 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