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