tree be637547c725febd189f8b263693db6557ddaa7d
parent 8b452f94389a3221fafe61dff75f6ed6d4347c9e
parent 2d615e0e13e76a77a03ad29121f35af6ff36e3ef
author Alex Ruiz <alruiz@google.com> 1440712810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440712810 +0000

am 2d615e0e: am 6158b0c8: (-s ours) am d0aaeb05: am 42282d25: Merge ""Build Variants" view is only visible for Gradle-based Android projects." into studio-1.4-dev automerge: 6accd87 automerge: d339ffe

* commit '2d615e0e13e76a77a03ad29121f35af6ff36e3ef':