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

Change-Id: Ie2af4250a408f55c2857629e00b3915e23a5268b


Trivial merge