| commit | 2fb5a9d1f167c976530f4aa59ba4dff5a26a08fe | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Jun 18 14:54:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 18 14:54:24 2020 +0000 |
| tree | 8ff5c5d0b52d1fe1d3a7f66f91a919afa90504d8 | |
| parent | d5cd1b71ee618344857d9e643ffbd808d66128dc [diff] | |
| parent | 0382ca9dc19362c6adaa7b42d680fbd3de59b936 [diff] |
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: 18e59cdc1d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350 Change-Id: If981217ab2887f0ff7257d1dc22edf61300ed6f2