commit | d93fd9dd8e3a8d7971bde779628cf2b064a4dc73 | [log] [tgz] |
---|---|---|
author | Victor Berchet <berchet@google.com> | Mon May 02 22:13:01 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:13:01 2022 +0000 |
tree | e59caca38b10cd7f1552cf09b50a433c0a1527e4 | |
parent | 548bf8cc64f15eda41298d6a027bfee95501afc5 [diff] | |
parent | a492c2f2d9b945b7d97ababb1b105b219f18bc5a [diff] |
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I86c387fdcbbc16923d096af5795c168c1a853a5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>