tree c3693cf1fb99f986ab718cfb9deba34db4352d2e
parent 3fee7dc78af70ac9ca383f40e511ffaa378894b1
parent 35aecbe92761c7608ce3942f5743bae8254fdaf6
author Joe Fernandez <joefernandez@google.com> 1421447686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421447686 +0000

am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
  docs: adding studio-sample-in-editor.png file