[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours

am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history

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

Change-Id: I259c3a257511436baac8894c7677dbd3090941ab
This commit is contained in:
markchien
2020-06-20 04:32:18 +00:00
committed by Automerger Merge Worker

Diff Content Not Available