OSDN Git Service

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

Change-Id: I6a96c10e941e9cb8c055f6256bdd06da423176e7


Trivial merge