summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2022-11-05 01:13:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-05 01:13:23 +0000
commit99f48340ac17f3864d0355d388c441fb7ad3f8f1 (patch)
treef8c13f79bd3d8a4e0ea22054eb0a0ee670cfac09 /libs/androidfw/ResourceTimer.cpp
parent69b752610f62da56ed66e58ca330755ee3ca09a2 (diff)
parent7adf19f3fa66deb8f0ae088becedfe8e975abb66 (diff)
Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba am: 7adf19f3fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552 Change-Id: Ic7c18fc4fa02b79d3fad18653e4c2e9ad424ea12 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