OSDN Git Service

[automerger skipped] Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1 am: 97f1fa1688
authorBeverly <beverlyt@google.com>
Tue, 16 Oct 2018 13:17:10 +0000 (06:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Oct 2018 13:17:10 +0000 (06:17 -0700)
am: 690f5f81c6  -s ours

Change-Id: I9a0085d528ca9ed9751d03d23eb7f320b3fa7de8


Trivial merge