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