summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Andy Wickham <awickham@google.com> 2023-12-20 06:38:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-12-20 06:38:50 +0000
commit8f40d44c736e42a4cc133ab65db1d10fc71378be (patch)
tree51697ffa4990f32c14e9a64e003bc03729ba0bec /libs/androidfw/ResourceTimer.cpp
parentef8d973851dbdfe107df8461f950feac06d87453 (diff)
parent4a1dabf6c93187d92552f16428e9b5ed85a184c8 (diff)
Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw", "cherrypicker-L23700030000857114:N48700030014533099" into udc-qpr-dev
* changes: Disallow startAssist while lock task mode (kiosk) is active. Fix ScrollViewFunctionalTest running on Test thread
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions