tree aae71e730a1cabb68766fdc3c653c02b162d18ce
parent e29ff464f43d694da740cb255c3b3c5c3d662c7a
parent 101a6598f80b533a0b073a276dc4939aa7beab12
author Treehugger Robot <treehugger-gerrit@google.com> 1593541236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593541236 +0000

[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N MR1/N MR2]" into nougat-mr1-cts-dev am: 101a6598f8 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1318398

Change-Id: I3571729a8dd2b9a59fd7530500f72f9aabf87141