[automerger skipped] Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: e3e5ae9eae am: 94ab937da8 am: 698a443116 -s ours

Browse source

am skip reason: Change-Id Idefcdd64afa7977f6dc2c4299e69cc5065dcc20d with SHA-1 80f5025a88 is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1541058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ed5914d0b099a8931afd456a7e9369d20b1db9d

...

This commit is contained in:

Shawn Willden 2021-01-07 00:18:48 +00:00 • committed by Automerger Merge Worker

parent fd323af96d 698a443116

commit 6aacd7c1f3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available