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

Change-Id: I223834ca2c69a6c5ded8138888a2d0b02a62f1fa


Trivial merge