tree afff56da5ff38ee646297065c464f7260aa6bb99
parent 35d22bff7a9010c68f079e5e401b1ae3b5847f51
parent fa82c449aefa2a5d47d2342318a64ecb906bd1a9
author Xavier Ducrohet <xav@android.com> 1348523965 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348523965 -0700

am fa82c449: am 45825eae: Update platform-tools sdk comp to 15.

* commit 'fa82c449aefa2a5d47d2342318a64ecb906bd1a9':
  Update platform-tools sdk comp to 15.