tree f9c384b1aa9904abe20dd3690bf9889fba4799fa
parent 21d6fd53641fb9ac35a95d534bfcbb657ccc7769
parent 42198eab28ca89718e8d420036ad26c21b442a61
author Brett Chabot <brettchabot@android.com> 1323286559 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323286559 -0800

Merge "Update tradefed prebuilt to fix emulator support." into ics-mr1