summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-03-02 19:44:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-02 19:44:47 +0000
commitd003e8133167f2b6741f8eb925fdc9f77c2800a5 (patch)
tree9c426ee7c94290ff51df60ed0e84d4b77e934750
parent81449b2c4a63392bff22d77f331f4db52011884b (diff)
parent369ad57b00f1c94c80f0f80ef2e7063a23a94a84 (diff)
downloadframeworks_base-d003e8133167f2b6741f8eb925fdc9f77c2800a5.zip
frameworks_base-d003e8133167f2b6741f8eb925fdc9f77c2800a5.tar.gz
frameworks_base-d003e8133167f2b6741f8eb925fdc9f77c2800a5.tar.bz2
am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84': Fix codestyle for switch statements.
-rw-r--r--tools/layoutlib/.idea/codeStyleSettings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml
index 1f08f09..89f7b34 100644
--- a/tools/layoutlib/.idea/codeStyleSettings.xml
+++ b/tools/layoutlib/.idea/codeStyleSettings.xml
@@ -40,7 +40,6 @@
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="JAVA">
- <option name="INDENT_CASE_FROM_SWITCH" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />