OSDN Git Service

Merge "Add more behavior to TimeDetectorService" am: b1fc5a4c7e am: 325ecf7df4
authorNeil Fuller <nfuller@google.com>
Tue, 26 Jun 2018 12:33:35 +0000 (05:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jun 2018 12:33:35 +0000 (05:33 -0700)
am: 55b29baea1

Change-Id: I4fe5fe32ffbd807680d688f4415e5dc9e47069d5


Trivial merge