tree 53cfab5dd8ce23d9bb07c28c674360466c217908
parent d7c097e46451641f99a21638786c5939ca82c557
parent f32b66a45d6d74a427bf4a159296b389a26c4d7f
author Brett Chabot <brettchabot@google.com> 1354044831 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354044831 -0800

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

* commit 'f32b66a45d6d74a427bf4a159296b389a26c4d7f':