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

Change-Id: I8fd3f2dac244cddb228d780cb2e7ab4943b1cb9b


Trivial merge