diff options
author | Xin Li <delphij@google.com> | 2020-09-01 22:09:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 22:09:55 +0000 |
commit | 40fb530f06a5a78c162cb102c34cca7be9811f53 (patch) | |
tree | efc9993f95bc800a0e0a26159b7a3541369f0622 /trusty/coverage/coverage_test.cpp | |
parent | f6b726ed54b722dfdfcb13c823af779d7b94e605 (diff) | |
parent | 0f0458a3e9e93ace07182e5f01000770d5cde9a9 (diff) |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 15144fd1ec -s ours am: fcff35f4db -s ours am: 0f0458a3e9 -s ours
am skip reason: Change-Id Id18cb0e2d2f3e776a42b566c4a1af2e250890896 with SHA-1 8ac68188ac is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12484875
Change-Id: I1e53e4780599d58536f526a0b128d3d6c04576fd
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions