summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2022-08-15 01:38:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-15 01:38:32 +0000
commitbb77da695a55ab4428ad55ac34b04f52a9c74ec1 (patch)
tree67922affb514fc0c94a141708bc22e424e379597 /libs/androidfw/ResourceTimer.cpp
parent304cb179a6a509626a73fff562e7dd92efdf3c6e (diff)
parent84ffde6aee020830fc812a712f8d2d17c5fffab8 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours am: 5a13803145 -s ours am: 84ffde6aee -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518947 Change-Id: I7de55f2d7c12c6aec3df37987fec0b85f70f3920 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