tree 0d7b5719cb6b3541ca87149040cb8c2566d85ffc
parent 803668c0a31f96c03cb4d98f9409dc8bd8a94c80
parent 75278bf41bbef5e38393e2fe4e4ef6f34b290e97
author Steven Moreland <smoreland@google.com> 1617308495 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617308495 +0000

[automerger skipped] Merge "Partial: ActivityManager: use proc state from compiled aidl" am: bd32be9d25 am: 47fdcc5151 am: 75278bf41b -s ours

am skip reason: skip tag Change-Id I3dafe7a75b2dae561583a7821284027a1896b9a5 with SHA-1 423349508c is already in history

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

Change-Id: Iee185810b194f12d5ef34de1f9d1efa0205f07f7