summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2022-08-04 08:06:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 08:06:06 +0000
commit75c1b0e05444320aaf0ddb33b426e79d9f1eb183 (patch)
tree57c898733868ec2c79c3847973a093cd849b5922 /libs/androidfw/ResourceTimer.cpp
parent1b3f335732cedbf20b55ce425128f4ceb7211a15 (diff)
parentaea53a16bcbf6d1123c8cca370f80427ddaa9992 (diff)
Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-qpr-dev am: df4e467f94 am: aea53a16bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492656 Change-Id: I21a8d3c1a7233a5dc9a48add4cb976f7a78f32bd 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