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

Change-Id: I09771c4622664a3e9fd124d8f13e619f8840e2de


Trivial merge