commit | 33d25959dbf2e277cef88e36dcb3cbe19bdd5af1 | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Oct 31 18:49:30 2022 +0000 |
committer | Yimin Li <ymli@google.com> | Mon Oct 31 18:56:19 2022 +0000 |
tree | bad9ec55548f61e7c9666654699cbb9aad5a01fd | |
parent | d503d4de72bc444818452d4c934c149d2c9a76bd [diff] | |
parent | 9e49886a91909b5f36a9031e33b69603d058e39f [diff] |
[conflict] Merge cherrypicks of [20271394] into tm-qpr1-release. am: 9e49886a91 Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Permission/+/20317873 Change-Id: I4cd27ff1e3d3ad44dc5e4c78fef92205c1c25c22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>