commit | d9cfe4f898f40df646d988bc19c5548975c4c48e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 09:00:16 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 09:00:16 2021 +0000 |
tree | 025480df01ca7a285d46fa044b17a3c278d79b5e | |
parent | d2e1b6e26467517fee69696afb0888ace4255473 [diff] | |
parent | 0cc3a4c0b30334ee87a37686ffece8c0d0ea43f7 [diff] |
[automerger skipped] Merge Android 12 am: 2342573721 -s ours am: 74ae06ba8b -s ours am: a564647a66 -s ours am: 40c82a0fe1 -s ours am: 0cc3a4c0b3 -s ours am skip reason: Merged-In I58a93835530a24f98bdbac96cd16de048bc53e6c with SHA-1 b1d1eb861d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Permission/+/1847896 Change-Id: I3c4b5f11b0d7ce9217122fe4e6a18fe5d7a5d22d