tree be637547c725febd189f8b263693db6557ddaa7d
parent a1b1813f99a55409be180592b666f6b89e4123a3
parent 29b51ba5d3d0bdfb7b045f8305fbd59d6956e13b
author Alex Ruiz <alruiz@google.com> 1440712809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440712809 +0000

am 29b51ba5: am cfc41115: (-s ours) am b4bf5018: am acf3114f: Merge ""Gradle Sync" action is only visible for Gradle projects." into studio-1.4-dev automerge: 5316b76 automerge: 9deb3a3

* commit '29b51ba5d3d0bdfb7b045f8305fbd59d6956e13b':