diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-08 22:00:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 22:00:12 +0000 |
commit | 8292947bef1229232b14c32f9973e723e64eb10e (patch) | |
tree | e3db0fea63cd3b2e89f1fedd82f7b2e1f4ad1d63 /trusty/coverage/coverage_test.cpp | |
parent | e96842e59e554e0ea812a3c21b7572917e44a7fd (diff) | |
parent | 86f326500a3301e1c9a5c429c8c894fc32a8a808 (diff) |
[automerger skipped] Merge changes I51628abe,I412d62b7 am: 9e84b3166f am: 8f713c56bb -s ours am: 86f326500a -s ours
am skip reason: Change-Id I51628abe05599422eb3f344781d8f3acd653c822 with SHA-1 bd6d2cded8 is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358184
Change-Id: I30020e9fc2f07365539dc1ca60dadff7077dfefa
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions