Android N Preview 3 (NPD35K)
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 '6158b0c88305deeea52d2f7154ebeac8dede58b8':