summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 05:47:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 05:47:52 +0000
commit668c34186d232813dcef6332e3298e47b2a6513f (patch)
tree400d949dbae7461af02c3e5397e98ccb71bba464 /libs/androidfw/ResourceTimer.cpp
parent84789855ada823c44961652e5d97d8abad743355 (diff)
parentf5634815f049d5dc529871dd7f95e0b9c26dcdba (diff)
Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c am: 5a154b395a am: f5634815f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999 Change-Id: I3c548fdbca5e01a80903dc0caa8289b80d3a7032 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions