diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 17:59:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-24 17:59:28 +0000 |
| commit | 62ba346d02e5da1ad8b5e83812e27c985f70c790 (patch) | |
| tree | e43cbe9254723df5333191bf99e06816901c1a18 /libs/hwui/renderthread/CacheManager.cpp | |
| parent | 5d4338ed144bb2396c2c75fc24276b9a0bb400c8 (diff) | |
| parent | 0efd0f7e72f818583f3f6d4fc04872465aa9e525 (diff) | |
Merge changes from topic "am-e2575a2d294548018bebf31bff51e3dc" into rvc-qpr-dev-plus-aosp
* changes:
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." into rvc-dev am: 00c2e16b28 am: ceabe2e3d0 am: d2b90633d3
Merge "Relax locking for startActivityInPackage()." into rvc-dev am: 3c76edd5a3 am: 388ec641e4 am: baabf7a464
Diffstat (limited to 'libs/hwui/renderthread/CacheManager.cpp')
0 files changed, 0 insertions, 0 deletions