OSDN Git Service

am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into...
authorJoe Fernandez <joefernandez@google.com>
Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)
* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file


Trivial merge