commit | 2d615e0e13e76a77a03ad29121f35af6ff36e3ef | [log] [tgz] |
---|---|---|
author | Alex Ruiz <alruiz@google.com> | Thu Aug 27 11:16:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:14 2015 +0000 |
tree | be637547c725febd189f8b263693db6557ddaa7d | |
parent | 29b51ba5d3d0bdfb7b045f8305fbd59d6956e13b [diff] | |
parent | 6158b0c88305deeea52d2f7154ebeac8dede58b8 [diff] |
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':