tree e5f412f8995a8a229266304d72e7969773bf3b8b
parent 50fd6f440e7477a9caf7e6f986f9aee031e61ab8
author Brett Chabot <brettchabot@google.com> 1353968450 -0800
committer Brett Chabot <brettchabot@google.com> 1355155949 -0800

DO NOT MERGE: Manually update tradefed prebuilt from jb.

JB change is  Ie24751f7f3dc02701abdbe38ee42d18d3133aff2

Automerge didn't work due to change in prebuilt location.

Change-Id: I54a0784a2c1e8d790be2dafe910d36e266450b5d