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

Change-Id: I18a102999357266e6c37f1da9f7248c6daf11e06


Trivial merge