tree a3a043c9a288ab887074f5bb2f158cd15997aa5d
parent d259fb3757f0813b3bb13dea9a65c6cab6617fc6
parent bea6f1e6457841b8be4e45ecb713762894799f7a
author Joe Fernandez <joefernandez@google.com> 1420511171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420511171 +0000

am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs

* commit 'bea6f1e6457841b8be4e45ecb713762894799f7a':
  docs: studio device emulator updates