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

Change-Id: I5417a92bc591dc2e95b43f83043f89f9b2780975


Trivial merge