tree be637547c725febd189f8b263693db6557ddaa7d
parent f561bda02daceb78b5feb8a5701ac9d6d63f13c9
parent 1c8e98f298583ac7b5f584239395843608c771b3
author Fuyao Zhao <fuyaoz@google.com> 1440674137 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674137 +0000

am 1c8e98f2: (-s ours) am 12d6d3e9: am 915ca316: Merge "Change gradle\'s language setting when trigger language level change quick fix" into studio-1.4-dev automerge: 79a69f4 automerge: 4b57c94

* commit '1c8e98f298583ac7b5f584239395843608c771b3':