tree 52f4cc8588931e1590e9b60f2f04e30035b9db37
parent bfaeeaf16ce002bfb3a29d43efdd28181045c5f1
parent b6f4ef44def5349bbff8c70164cd91719005f4b6
author Xin Li <delphij@google.com> 1633656828 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656828 +0000

[automerger skipped] Merge Android 12 am: b6f4ef44de -s ours

am skip reason: Merged-In I118a1dfd5c52cfe1dbc3b1099f29b4146aff1803 with SHA-1 bfaeeaf16c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/1847361

Change-Id: I33019ca8d72636aabd3323eaaafb7ef861eed299