[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours am: e3c5268531 -s ours am: 631e3434f8 -s ours

Browse Source

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: I0f79720573d67384da0f1e687665aea48b2daace

...

This commit is contained in:

markchien

2020-06-20 05:10:49 +00:00

committed by Automerger Merge Worker

parent e1dd54f6d4 631e3434f8

commit 1fa26354c0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available