diff options
author | Shawn Willden <swillden@google.com> | 2021-01-07 00:18:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 00:18:48 +0000 |
commit | 6aacd7c1f30a699f3edae1d3e78b29163729dca9 (patch) | |
tree | b36c2b01da47995b1c8db40f25603242ff88dbd9 /trusty/coverage/coverage.cpp | |
parent | fd323af96d727cc9521710fa7a844b15e89ffd68 (diff) | |
parent | 698a443116a9fe3611ecdc0a7f9c75f16d56ed67 (diff) |
[automerger skipped] Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: e3e5ae9eae am: 94ab937da8 am: 698a443116 -s ours
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
Diffstat (limited to 'trusty/coverage/coverage.cpp')
0 files changed, 0 insertions, 0 deletions