commit | 62a0230994c41a07e0b01e3774a60423996d051a | [log] [tgz] |
---|---|---|
author | Victor Berchet <berchet@google.com> | Mon May 02 23:28:39 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 23:28:39 2022 +0000 |
tree | 397e042738ec438ea55c3a906e8bdd4042edcea2 | |
parent | 235bb0d7a4bd52390887d1eb35d0aa5cd32e9512 [diff] | |
parent | ae0479380ad6ae1f8dde8a4b3ae839d69d49ac8d [diff] |
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814 Change-Id: I8b8c1d10e686d41b4d35fdd5024dea9dc57c425a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>