aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-20 19:38:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-20 19:38:37 +0000
commit43b3cb900346348e36158eb2045ca762d3c3c4f0 (patch)
treeefb612fef3e22c977a12b615467032ce69f72870
parente33f106b711f505541b9594e64e94aaf4665f668 (diff)
parentf4c22a5117837a1bbef5b0a4339623e33133182e (diff)
downloadtradefederation-43b3cb900346348e36158eb2045ca762d3c3c4f0.tar.gz
[automerger skipped] Merge "Merge "Make LogFile serializable" into oreo-cts-dev am: 45be81bbeb" into oreo-mr1-cts-dev am: f4c22a5117 -s ours
am skip reason: Change-Id I4ea466ef50ee7de1b81a18aeed4ea0c44512aafe with SHA-1 52fb8dfdb0 is in history Change-Id: I8816c0cc9db05cb08724c0c31e44cb4fd0f3a98b
0 files changed, 0 insertions, 0 deletions