tree c7d4512b0a397d04ca7c7ed7db7ca65a36cc67ae
parent 72039c7a7c24f87dcf63deafdb644985b683afa2
parent 325ecf7df4c03bf3ee96a508e4293f783ba9a26e
author Neil Fuller <nfuller@google.com> 1530015806 -0700
committer android-build-merger <android-build-merger@google.com> 1530015806 -0700

Merge "Add more behavior to TimeDetectorService" am: b1fc5a4c7e
am: 325ecf7df4

Change-Id: I28d5b3dbd666dc9d097f6fb7c15dc5ba8cf931e9