Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am...
authorPyry Haulos <phaulos@google.com>
Thu, 14 Sep 2017 05:45:04 +0000 (05:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 05:45:04 +0000 (05:45 +0000)
am: b894b8405a

Change-Id: I0b1b505013d1abc6fc21c5acbaf33c97bb52c25b


Trivial merge