summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-20 23:55:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 23:55:30 +0000
commite422fd56ef3ac160061f5cfb93ba660acd033db9 (patch)
treead965d6ea05dad0969b98c4018f9f06933f1f463 /libs/androidfw/ResourceTimer.cpp
parent01bb926d2059b722462b7437975273a98c7abea0 (diff)
parent6f4a41293ee831e913aae8901463357982020c3c (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: 811913a928 -s ours am: 7407517df1 -s ours am: 6f4a41293e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: I89f04b62ca688d9119abd9dd03aaf7fe8d8b50da 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