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

Change-Id: I59da57b654d86c8e5a49068db970566c8e5373d8


Trivial merge