tree f5f158caa46550c9144606d3c5d90bd7b6868528
parent 140b1b007707d99eacfe137e411e0cd7b2fb7280
parent 88f036925e3850c16c2bec29722dafca39d30430
author Brett Chabot <brettchabot@google.com> 1354045005 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354045005 -0800

am 88f03692: am f32b66a4: am e63e2c84: Manually update tradefed prebuilt from jb.

* commit '88f036925e3850c16c2bec29722dafca39d30430':