tree ab36c294ad7b81fc2c01bc7e2fa2b5252da57887
parent d1700b3355a70d9d0aef3eb75219c01ea97fb0e2
parent a0be2d5cc59737c7dd523bb24dc13bf4843dca16
author Hui Yu <huiyu@google.com> 1648142229 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648142229 +0000

Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9 am: a0be2d5cc5

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

Change-Id: I278a9e0c7cf4f42431a40c054738873888bf033f