[automerger skipped] Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" am: c0b44fca8b am: 902918a433 am: 96cd149dfb -s ours

Browse Source

am skip reason: Change-Id Ife767a40b7b7790ba28b5377046de822ddbf275c with SHA-1 72eeb557e7 is in history

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

Change-Id: I93a7443dabeb35e8ab6e32004730f99e2fc49d69

...

This commit is contained in:

Treehugger Robot

2020-12-01 18:26:27 +00:00

committed by Automerger Merge Worker

parent f5417ce9b6 96cd149dfb

commit acd938821f

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