tree 95cff731681fb8ba25bad48be06311358eddfa4a
parent aa22e26a489af87b0175b38c4f7de963130f3102
parent 48257f16c678c48d70acb67985c1bc4d1a77bba8
author Joe Baker-Malone <jbakermalone@google.com> 1429899529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429899529 +0000

am 48257f16: am 31f5e7f4: Merge "Adopting the external update api to update SDK components" into studio-1.3-dev automerge: 22ef8ec automerge: 068e2ee

* commit '48257f16c678c48d70acb67985c1bc4d1a77bba8':
  Adopting the external update api to update SDK components