tree ffc45aa5e37b5183d063b88a59f8a2ac2b261d2e
parent d1d6dc7306ae126bf3f0f11590f282493aa51edd
parent ac19e9bc4a872453c8e5004d469989d4d985f2b3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593127034 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1593127034 +0000

Merge "[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N]" into nougat-cts-dev am: 91c5ba594f -s ours" into nougat-mr1-cts-dev