summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-03-02 20:03:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-02 20:03:32 +0000
commit7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07 (patch)
tree93eba4143465777bb25a35c5f23c0c6a7ef616b8 /tools
parent4a194d3b7f3ea4aebc5a1a8f95ccaac248c1b89d (diff)
parent4e87709b8b41a12d6caf2bd1110beed20e5b88e5 (diff)
downloadframeworks_base-7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07.zip
frameworks_base-7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07.tar.gz
frameworks_base-7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07.tar.bz2
am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5': Fix codestyle for switch statements.
Diffstat (limited to 'tools')
-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" />