[automerger skipped] Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2 am: ef0cdab0bb -s ours am: 39d1e71dca -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: I6353823f1d41f054a6e56ab6a5fc03576fc44ba8
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:34:11 +00:00

committed by Automerger Merge Worker

parent 7f3d885eec 39d1e71dca

commit 2542b91a36

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