Merge branch 'master' of https://github.com/dahlstrom-g/intellij-community into dahls...
authorpeter <peter@jetbrains.com>
Wed, 3 Aug 2016 11:55:20 +0000 (13:55 +0200)
committerpeter <peter@jetbrains.com>
Wed, 3 Aug 2016 11:55:20 +0000 (13:55 +0200)
1  2 
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java