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

Change-Id: I6cb9841790f4027016df0c7cf8023ab991334125


Trivial merge