diff options
| author | 2022-08-01 21:54:35 +0000 | |
|---|---|---|
| committer | 2022-08-01 21:54:35 +0000 | |
| commit | d069fb941a24c1ab33c5b5b46ec5b04621d987f0 (patch) | |
| tree | 365deef86dd1a2aeefe656411922435f42c106ce /libs/androidfw/ResourceTimer.cpp | |
| parent | cd5d81e2a37e475ae1d19de6666cc28253aed2e8 (diff) | |
| parent | 25b52343a5bbe872a26c1093a3e96fe568698e55 (diff) | |
Merge "[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" into tm-qpr-dev-plus-aosp am: 25b52343a5 -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: I62a5b6e42248b583c54ffac8460749f27779ed8b
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