tree fad71d74ee4089ff2016d56f73f723c4d222ad95
parent 6ed9b75a45ec4bc62b4a0fac2c86479d61918863
parent 2cbda290f66b5a17d3542ada26f7e91b3893f72d
author Rich Slogar <rslogar@google.com> 1425345633 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425345633 +0000

am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update