tree fc26f3c13f36ae383ec1ff294c16de8b8936c38c
parent 449057468dcf1945c2d82b9840a183d868d6fd7a
parent 742f1bebd4d44cdbf60dcb056d436c1cd98015d5
author Sami Kyostila <skyostil@google.com> 1522342315 +0000
committer android-build-merger <android-build-merger@google.com> 1522342315 +0000

Merge "service: Fix trace write period drifting" am: a443e83265
am: 742f1bebd4

Change-Id: I83b00b7b5bc2f90e1046e55cffb0a7abfd0f9968