tree e99bb11738df0e998d5af9ed75454f5e469a6e01
parent feb362a5d194b30226caf2efbaae77991007c65c
parent d801a1238392b8c7a8e0131cee89370143363046
author Joe Fernandez <joefernandez@google.com> 1422661270 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422661270 +0000

am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs

* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update