tree 12177033b5c405279f3d51a88b58ba1345478800
parent 6236d559fdfdc177a1bfa52dcfa72121b578bc51
parent f9f0224103c189fec3b3f3099ed90f4a1584c1fa
author Xavier Ducrohet <xav@google.com> 1327727529 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327727529 -0800

am f9f02241: am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1

* commit 'f9f0224103c189fec3b3f3099ed90f4a1584c1fa':
  Move api.xml from tools/ to platform-tools/