tree adfa8dcf5c4baa229f9a0d8beccce3c49853372a
parent cc86adcb3d78a64aed159facb1ad74d0e90310d3
parent e63e2c8458094286eae151b89770a4f946631726
author Brett Chabot <brettchabot@google.com> 1353970780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353970780 -0800

am e63e2c84: Manually update tradefed prebuilt from jb.

* commit 'e63e2c8458094286eae151b89770a4f946631726':
  Manually update tradefed prebuilt from jb.