tree aeb601a7e444ec65e273554773bd5af2934e8ada
parent 21ad4524237201e52d6598201d46f06c1556d971
parent cc7446f5e2e2118e9c06136b9ecbdaa4eb7c3585
author Nate Myren <ntmyren@google.com> 1640204862 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640204862 +0000

[automerger skipped] Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev am: e904d48c7e -s ours am: cc7446f5e2 -s ours

am skip reason: Merged-In I7e754c067520765c00cc67cc310926e63bd0462d with SHA-1 e5e4a8df8c is already in history

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

Change-Id: If5d56a004869e399db0d716e7b0a46b789f8ae5b