tree be637547c725febd189f8b263693db6557ddaa7d
parent aa530d8392f2a95f1519c8b55d9d075c51a44ec9
parent eb200830a93b51c36c920fa0b80e9da29d7b2287
author Fuyao Zhao <fuyaoz@google.com> 1440712767 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440712767 +0000

am eb200830: 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 'eb200830a93b51c36c920fa0b80e9da29d7b2287':