tree 28d42a3105db6217eb5d6acb5d6cac9191ec2a04
parent d62964ad26037b4404723a3f57fd898271f94a90
parent 890c081b5f9d1d4ed5f662a6e9499661406fda73
author Unsuk Jung <unsuk@google.com> 1415040574 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415040574 +0000

am 890c081b: Merge "Bump CTS tradefed version to 5.0_r1" into lmp-dev

* commit '890c081b5f9d1d4ed5f662a6e9499661406fda73':
  Bump CTS tradefed version to 5.0_r1