diff options
| author | Xin Li <delphij@google.com> | 2020-09-02 01:59:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 01:59:21 +0000 |
| commit | 089b5dc44d738d24aecf7460f906936ae3bdb1c8 (patch) | |
| tree | e4dbfbc053d12ec4ed0810ea35e35e05db711e13 /trusty/coverage/coverage_test.cpp | |
| parent | 1f5ea5b8e9fcd03dd21e1e80d3b7e5e894c11ed1 (diff) | |
| parent | 40fb530f06a5a78c162cb102c34cca7be9811f53 (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: 40fb530f06 -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: Ifeef81c02a1ecc9d487435bfc9d67e998e364a67
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions