summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkAssets.cpp
diff options
context:
space:
mode:
author Hani Kazmi <hanikazmi@google.com> 2022-07-05 12:18:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-05 12:18:03 +0000
commit48e0ac1311544afa60fc013445fab24f4388ee31 (patch)
tree314a06f4ca27ecf365ade0a259ac54281d2f3e2e /libs/androidfw/ApkAssets.cpp
parent638caaf7b388bbc16dcd1ccf23a338d7f9f278fa (diff)
parent5005c4a93d9638b20e719976531e3e91cae8f74b (diff)
Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am: 97211945a8 am: 715e417609 am: d74c99a05f am: 5005c4a93d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2139755 Change-Id: I92798cf63fdff3ea5163137740286a2e1b66ad2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
0 files changed, 0 insertions, 0 deletions