[automerger skipped] Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2 am: ef0cdab0bb am: 92a551e04a -s ours am: f8148fae11 -s ours

Browse Source

am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 b708333765 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18114464

Change-Id: If52e5be803e0b9eaacc7fc4999987e7ec5407b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Lucas Lin

2022-05-25 11:55:30 +00:00

committed by Automerger Merge Worker

parent b4bc27da40 f8148fae11

commit 4c9b21a12e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available