summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Dmitri Plotnikov <dplotnikov@google.com> 2023-08-12 02:52:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-12 02:52:29 +0000
commitc4eeaaee38c6cbd1b7c3402104d28a56f15578af (patch)
treef4bcb9bf0eea5a87358afb05cea960a2dbbba2af /libs/androidfw/AssetManager2.cpp
parent80cf795b0812dfa3c1fc20c976323dd108fa2291 (diff)
parent4b34b234bb81e2251e4eff939c72dd0039baaf8b (diff)
Merge "Assert type of 16-bit value in MultiStateCounter parcelables" into udc-dev am: a07255e755 am: 8ea2d77a28 am: 4b34b234bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23698712 Change-Id: I5061684b0e3561786bc486287aa83333adc1514e 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