commit | 05fb676897986da9317d66f2b38a6074d0386aaf | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Aug 17 01:00:56 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 17 01:00:56 2022 +0000 |
tree | 59890db98e383d8515c9333b15ae0ed66355f0a9 | |
parent | 0a17bbfc13413048f508eeed5ff374c03d929ade [diff] | |
parent | b58983bded9edf1bbe65b882a88718470b73a3b8 [diff] |
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 12f3a71e92 -s ours am: 02a8a09938 -s ours am: b58983bded -s ours am skip reason: Merged-In Iabfc69ff9de5b7ed996e678344a9a2696f2cc47d with SHA-1 921ea8ee59 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2184305 Change-Id: Ib7d07966036a2e8d51464a8d1964b0b2e7c0011f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>