summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-03-02 22:46:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-02 22:46:23 +0000
commit5ae7f103beb9064044af42236491a9b4efba375e (patch)
treed1d399e86a3c9cbfbc5525df6f6cdf21b06b2852 /tools
parenta104b1886b202e8d1414bd0041aaf5ce234beb86 (diff)
parent6e64fabecafcc4c367dc04cd071ff8ddc8bb3d85 (diff)
downloadframeworks_base-5ae7f103beb9064044af42236491a9b4efba375e.zip
frameworks_base-5ae7f103beb9064044af42236491a9b4efba375e.tar.gz
frameworks_base-5ae7f103beb9064044af42236491a9b4efba375e.tar.bz2
am 6e64fabe: am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
* commit '6e64fabecafcc4c367dc04cd071ff8ddc8bb3d85': 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" />