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

Change-Id: Ie960b01bc31c94107bf7c545aef03b2e9d5671ed


Trivial merge