tree 81daadd60ea990ea5ee7213383fb6589ed4661de
parent dc0e9a07745d26e1d40a46faee6f723b68e272f2
parent c667c1f74abd96a2098520effdd5afdff7f0d34b
author Tor Norbye <tnorbye@google.com> 1401327730 -0700
committer Tor Norbye <tnorbye@google.com> 1401327730 -0700

Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
	plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ModuleExtendedModel.java
	plugins/groovy/src/META-INF/plugin.xml

Change-Id: Ib6de04d7226d4eb7f35f66304df68135ad6ff267