tree 1c69fa861fecd4fba0a9318406d11bacd9b67868
parent d2794f5eb308940e73906b97eb2e2f22edfbc78e
parent 5670ddea3bc16c43a2040a5a224ed5fda53d7072
author Scott Main <smain@google.com> 1393030878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393030878 +0000

am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs

* commit '5670ddea3bc16c43a2040a5a224ed5fda53d7072':
  add android studio to launch procedures