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

Change-Id: Icd88618ff5eb7cebfc9b0e210a24ecf4da68598f


Trivial merge