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

Change-Id: I648c5f0e8d281c51625350d93daf2879ad5a430e


Trivial merge