summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2022-08-01 21:06:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-01 21:06:49 +0000
commitf723ae818b7771c6b943d1a12575cfac74b8a47d (patch)
tree95282f3ade66e332cad22110cc527f2f53a048d7 /libs/androidfw/ResourceTimer.cpp
parentd5c5bfb74c86f210996bdb9b30e0453bef7fb1f7 (diff)
parent271f4475a0b8c50042e6cf876b8f69cc5cc2223e (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: f4b38cbaba am: 8bb45f2393 -s ours am: 4fb3676dca -s ours am: 271f4475a0 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19344104 Change-Id: I96dbb945a9db8638e32b2e82875a3c3bb3eee5e7 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