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

Browse Source

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

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

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

...

This commit is contained in:

Lucas Lin

2022-05-25 10:35:04 +00:00

committed by Automerger Merge Worker

parent 8dcd80f7e3 0b2c39c7b2

commit 76ca007028

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