summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-20 23:56:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 23:56:52 +0000
commit4a7b58fef5fe3a453a230ebdf4498bb276c856ac (patch)
treead965d6ea05dad0969b98c4018f9f06933f1f463 /libs/androidfw/ResourceTimer.cpp
parent9c900cecdf4dd517ec4e923f21fc7bf97687e6fd (diff)
parent637c8a86f8e112008901bfce1b75c3236c1edd9a (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 3c8b4759cc -s ours am: 4e81397655 -s ours am: 41f0b2f410 -s ours am: 637c8a86f8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: I7ad78b2ce621df2fad082ad19716dcdc70689454 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