diff options
author | Xin Li <delphij@google.com> | 2020-12-10 03:47:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 03:47:00 +0000 |
commit | e3555bf456301ecc9df01f81cb091a1b591e0092 (patch) | |
tree | a526ae78caad4813a843fcc8ccf0c66268cd7943 /trusty/coverage/coverage_test.cpp | |
parent | 6c9f509cdb57ed946cdd8b8721e0d2723894cad0 (diff) | |
parent | 203e24713a23ab5cbcf22602eea9ef1a7f5b5401 (diff) |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f96f8e8c7f -s ours am: 203e24713a -s ours
am skip reason: Change-Id Id57384c385a6d0bc931caf1054812a469daa9ed0 with SHA-1 3401909e7c is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3a2382a7b9266bff658085b8a32e310e2556aa1
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions