OSDN Git Service

Fix Timer unittest am: 4d0a9b422d
authorHansong Zhang <hsz@google.com>
Tue, 9 Oct 2018 02:51:07 +0000 (19:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Oct 2018 02:51:07 +0000 (19:51 -0700)
am: 652e4d91a0

Change-Id: I00c5e2617f83eacf97e8c488914c758bd250f760


Trivial merge