tree 8ea247439cbf70c0fb12a19d8acc4e72a361ed66
parent 7a2e85c83eabe113ca05d2ecf4633008d601a560
parent cd50066386887148f99dce9b449bed588a354bb3
author Joe Fernandez <joefernandez@google.com> 1421447388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421447388 +0000

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

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