commit | 113ca82dd55bd927c3d480f17725edb100449b56 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jan 03 23:00:47 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 03 23:00:47 2022 +0000 |
tree | 23e223e03be46158331f9b8bd5c5f4b2b39eec63 | |
parent | 96e73e03d0bb43fd53f27c8553149564a30c7aac [diff] | |
parent | bbb36e91ee9d2c6593c7e0ffe1ae4a6904cd9209 [diff] |
Merge changes from topics "ms25-appops", "ms28-service-fix" am: bbb36e91ee Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934458 Change-Id: Ia64bf2b5d678aca5aaad1dd90d1e41b04cbc34d0