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

Change-Id: I7155ee4dfca234f42d6cdd02ac65f65a6b10d504


Trivial merge