summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2022-08-15 02:04:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-15 02:04:37 +0000
commit806cd40238586c4eb1b374d4150052f27bcecb41 (patch)
treee64a79813aa06eaddef21d309dd0bb0669e1fa13 /libs/androidfw/ResourceTimer.cpp
parent37d00d34ec7addcd26686f2d38f1fab1b1976795 (diff)
parente2f3821ed7ef0f629bc44dd0f33986ee6b6e8c78 (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: e43ee48e5d -s ours am: 01d360f872 -s ours am: e2f3821ed7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518947 Change-Id: Ic5fea769659be6eeee2076e34634194258e28369 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