tree 182b620f7a30630fbe7a49dc5ab59f01925ac698
parent dfb6a767ca907530c568d4e00bf2942b845cbb8e
parent 7b0b977b46d1e7228b1894523e4ffd55daa63f8e
author Igor Murashkin <iam@google.com> 1487357137 +0000
committer android-build-merger <android-build-merger@google.com> 1487357137 +0000

command line: Forward --timeout values to caliper as --time-limit. am: 341c080d7b am: a01cb358e1
am: 7b0b977b46

Change-Id: I080a8648b18737b7fbfec58c460562e16366ef3d