tree 5f8ba8ea745620c1e10564bbdc81ba4d5ed261e8
parent 656efe66fbabb446b8f2a285d7f21d32b7f91bcd
parent 54ee466c5389e0e9326258364a063e57e106ef5b
author Xavier Ducrohet <xav@google.com> 1327727353 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327727353 -0800

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

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