commit | d0f0d010b88577c095517c794b8a6147c6467e04 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:01:10 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:01:10 2023 +0000 |
tree | bc831eff4370a0f7a4f497189e81cb622740be76 | |
parent | 768f615b256c8aef11ddd6a4f8d8131f74cc0139 [diff] | |
parent | 7dd6fbfbdaae8d78cc4f16c60dcc3d947ef81457 [diff] |
[automerger skipped] Merge Android 14 am: 7fb92e4232 -s ours am: 7f3a5bbd14 -s ours am: 177f99fa13 -s ours am: 7dd6fbfbda -s ours am skip reason: Merged-In I60a1c144ebf53927fd70693ef84ca9cb6d65d75d with SHA-1 e4fe7f21c3 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Permission/+/2775122 Change-Id: Ib70adbdca457b75a1de9136e14be4cbe67654a63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>