summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2022-08-01 21:53:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-01 21:53:43 +0000
commitcd5d81e2a37e475ae1d19de6666cc28253aed2e8 (patch)
tree365deef86dd1a2aeefe656411922435f42c106ce /libs/androidfw/ResourceTimer.cpp
parent4009f1858fa02aa98491207baf5c74aac9b3c2e6 (diff)
parentc698a8f4ae94949d4228972517156729c35e5062 (diff)
[automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into rvc-dev am: e35bab3aa0 am: f7b8f7233a am: 722ca99029 am: 404ae95e7b -s ours am: 4fbe2d51fc -s ours am: 840340547d -s ours am: d5c5bfb74c -s ours am: c698a8f4ae -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 d107a27fe5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104 Change-Id: I1b294218169b657372cd799193e0a6eabc69a904 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