tree 665fc0ddab67b396837f2322c9b930afb7404f96
parent 978134d5165d24060ce9c6947f5987f1005084f8
parent ab9e93c76f7f79c64cd52204cebb84a12063b8a4
author Guang Zhu <guangzhu@google.com> 1435997054 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435997054 +0000

am ab9e93c7: (-s ours) am 14135a76: update tradefed for CTS

* commit 'ab9e93c76f7f79c64cd52204cebb84a12063b8a4':
  update tradefed for CTS