summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2022-05-04 08:59:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-04 08:59:18 +0000
commit9d85608c4df88311239c0c288d79598de8c7af4e (patch)
treea46585795d017b643f93baf9819fccb1ad078de7 /libs/androidfw/AssetsProvider.cpp
parent0b5131609fde44ced518801da5da9280445781e0 (diff)
parent6b11b0f83b4c854b1721a1a853605dee97882783 (diff)
Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev am: 6b11b0f83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18131149 Change-Id: I8897f9313d54d548a343ffa6516d06fd6b94b1f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions