diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-04 02:01:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 02:01:46 +0000 |
commit | c05ddd33de80427ec39808faf55a509496fb87b9 (patch) | |
tree | ac0aa439193f94b5edf8fe9f501a7781a9874df8 /trusty/coverage/coverage_test.cpp | |
parent | d088e15e3bd3f56fced2fab0349d679b59e37c2b (diff) | |
parent | 104ee86e6488d7d1ef4e619b89196081e9677489 (diff) |
Merge "Remove invalid error message in the merge path." am: 3ce24b87a2 am: 104ee86e64
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1573320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id6592eb5e3b1df72bbefbe0d40fd7b8de7129e37
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions