tree e259b9e581c5b0e44e9f2e51cb941dc99eb12b3a
parent 80e4fba74ce18d0bc18ee32cbc64155993667e8a
parent 6cd337e6cf59ea59361548124d007c58171de856
author Xavier Ducrohet <xav@android.com> 1364341871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364341871 -0700

am 6cd337e6: Merge "Update ddms.jar prebuilts."

* commit '6cd337e6cf59ea59361548124d007c58171de856':
  Update ddms.jar prebuilts.