diff options
| author | 2022-05-13 17:54:45 +0000 | |
|---|---|---|
| committer | 2022-05-13 17:54:45 +0000 | |
| commit | 8e96b3fce3f7b416519fc5fec2f990038675ef98 (patch) | |
| tree | 0f8fc6ddd23e94424f2af49f81b744c16f77aa61 /libs/input/SpriteController.cpp | |
| parent | 0826307c1b0d2b7d551fdcdb755b6fd80c6bfe7c (diff) | |
| parent | 4cc4b29a9f21b2f3245ec5b5e45ce535276fef55 (diff) | |
Merge changes from topic "am-55c5397bff6a4f50bf27976d8d937343" into tm-qpr-dev-plus-aosp
* changes:
Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs""" into tm-dev am: 2c18b2e130 am: 7da79e2d11 am: 3c9a955897
Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" am: 704a86f316 am: 965185b792 am: 29bdc3e3f7
Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a am: 1368e8a55d am: 38c1a79163
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions