tree 2cfbea755971d89e10674318b6ab7596f16c172b
parent 575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4
parent 817796940bf79942ccd950cec47815039a2aa15e
author Joe Fernandez <joefernandez@google.com> 1418331791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418331791 +0000

am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit '817796940bf79942ccd950cec47815039a2aa15e':
  docs: studio basics haxm updates