[automerger skipped] Merge "ActivityManagerService: report current and max thrashing levels" am: 9af29add1f am: 656efc7acb -s ours
am skip reason: Merged-In I016d95a9b2ba4b6f4ca814be1456cec59f4834da with SHA-1 c8a318e8bb is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776886
Change-Id: I0a4eaa687aa73e47d5fe05fe2a81593b246e4192
This commit is contained in:
committed by
Automerger Merge Worker
commit
584bd3275d