summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 05:22:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 05:22:32 +0000
commitc728e9fab4622074c35a43dd1cac1dbf536b22b0 (patch)
tree678df02f4b189dcc973f0738298806d9b01ea552 /libs/androidfw/AssetsProvider.cpp
parent1a840382302b4a79b14608045f6d0e9ff16a1ad4 (diff)
parent5a154b395a3f67fecfbffa9b85d2f760a49546f9 (diff)
Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c am: 5a154b395a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999 Change-Id: I2720e0e7a673fa28950248bd8cb7eef15fd1052a 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