OSDN Git Service

am 248f3d36: am 77a70b12: (-s ours) am 110a5574: am f82f33d3: am 4c5b6cc4: Merge...
authorRich Sloager <rslogar@google.com>
Thu, 27 Aug 2015 20:00:11 +0000 (20:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:00:11 +0000 (20:00 +0000)
commit3973a0c8f37718d0f2aaa049390d0dee5dfc9bec
treeacd3e38539512eb037d74a6af7719b655d80b613
parent0a6ffb209ec54169a5d9131b660382f2438ff9bf
parent248f3d368b27d9af25cb8d69623dbeead1cb1723
am 248f3d36: am 77a70b12: (-s ours) am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs

* commit '248f3d368b27d9af25cb8d69623dbeead1cb1723':