commit | 36a6c5698934b05f26647714779fc10bae621c54 | [log] [tgz] |
---|---|---|
author | Mark Chien <markchien@google.com> | Wed Jun 17 06:49:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 06:49:06 2020 +0000 |
tree | 1e16469a63f6e9ca93147c51b2e0791229ee7e74 | |
parent | f4d3d4698183b46070fb2494305393790d80a1eb [diff] | |
parent | bccb89a1870ea77d03549ea7b2c7f3c79ee9da83 [diff] |
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350 Change-Id: I843709e8daa6ae49417cb1749d0880ffefda6cee