Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am...
authorPyry Haulos <phaulos@google.com>
Tue, 5 Sep 2017 16:16:00 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 16:16:00 +0000 (16:16 +0000)
am: 8dca54a6f8

Change-Id: Ib015feccaea3d1a91315ecc31ba957f85921eafb


Trivial merge