tree e25f214959c3c37520cb62973ef2caac0f6cd7a6
parent 7026df3b94143bf486c7477f1e3884ce255bb879
parent f82f33d3aef0c9211c5ed66d583ce6d5f5cf92eb
author Rich Sloager <rslogar@google.com> 1439825877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439825877 +0000

am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit 'f82f33d3aef0c9211c5ed66d583ce6d5f5cf92eb':
  docs: studio 1.3 live templates