commit | d684e1340658025abd057dc18475835360041fb9 | [log] [tgz] |
---|---|---|
author | Prabir Pradhan <prabirmsp@google.com> | Thu Jan 04 20:00:51 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 04 20:00:51 2024 +0000 |
tree | 4190d59e8e9ca7512f644f05435736b885bc3dbe | |
parent | c65469236a9cc82534ba4fa5cfb37a91b4418628 [diff] | |
parent | d10b99358f167e59ccfc4a206a40b923762e3a17 [diff] |
[automerger skipped] Merge "Add flag to mark key usage code as a fallback mapping" into main am: 587fb0bfb5 am: 0728d6ed38 am: d10b99358f -s ours am skip reason: Merged-In I137113d0dc9a1c8abf523b96942486be176d0240 with SHA-1 b2aff84fcf is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2896061 Change-Id: I86da356ec83a6f9a2c2cef67b593f34fbd187d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>