Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 338a411fd3
authorPyry Haulos <phaulos@google.com>
Tue, 5 Sep 2017 15:31:55 +0000 (15:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 15:31:55 +0000 (15:31 +0000)
am: 0d9b810283

Change-Id: Ic07c0dafc51bf12a82794d02786b885f8b1323f8


Trivial merge