[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 am: 5cc78e91cc -s ours am: 8bf0388721 -s ours

am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 92afd387fd is in history

Change-Id: I846d4312d831086e7d12d5a845aa3cb7e346afd8
This commit is contained in:
Mark Chien
2020-05-12 19:28:50 +00:00
committed by Automerger Merge Worker

Diff Content Not Available