summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-27 19:47:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-27 19:47:10 +0000
commit1f05e19f47677af66b69f117a6a4ed69ae6395ea (patch)
tree69176453994950d94312005f81fe754a01768899 /libs/androidfw/ResourceTimer.cpp
parent69194b040a4c17ab4199c641ef922d69777a5641 (diff)
parentd829ed5908fe8c46a279fc1e52a677bb07de072f (diff)
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev am: d829ed5908 -s ours
am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 18ddad1f5a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17637345 Change-Id: I37ee766495cdc0a0e9c53a39b122dfb53e78d08f 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