summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Wei Sheng Shih <wilsonshih@google.com> 2022-08-23 04:46:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-23 04:46:44 +0000
commitff0cd826a23e58fb382e3e4372d52912e58afa07 (patch)
tree05faaa1ae3710738fd2c4b5ac5de2c7a06b8f419 /libs/androidfw/ResourceTimer.cpp
parentd5bda3126cf71ea6bce63a8bf5d144d3afb1c27a (diff)
parent7689adc47fd3be77928f2107cb0a7ff50eb712b6 (diff)
Merge "[Shell Transition]Fix occluded activity could show behind keyguard." into tm-qpr-dev am: c050b87f30 am: 7689adc47f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19656380 Change-Id: Idb88091ac285deb5fbe478385e18439b63e9e591 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