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

Change-Id: I4bac001f8af3ff954aab3258a1187e5f97beb77b


Trivial merge