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

Change-Id: I1c814eb26484201058f3123b1e07a6da5491273b


Trivial merge