commit 8d29a06ad770d52ba4e62d0991efd8325c0eadfd
author Deepanshu Gupta <deepanshu@google.com> Tue Sep 09 00:31:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 00:31:03 2014 +0000
tree 3021a378998193518dd63b58d9d68670a1ed15d8
parent 93b828de58f02ab85371cb1eaa7f1a23a03a609e
parent 8c766fea936121e311745099adea1efc03d0d199

Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev

tools/layoutlib/.idea/codeStyleSettings.xml

diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml
index 33937b3..b324213 100644
--- a/tools/layoutlib/.idea/codeStyleSettings.xml
+++ b/tools/layoutlib/.idea/codeStyleSettings.xml
@@ -27,12 +27,12 @@
             <package name="" withSubpackages="true" static="true" />
           </value>
         </option>
+        <option name="RIGHT_MARGIN" value="100" />
         <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
         <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
         <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
         <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
         <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
-        <option name="RIGHT_MARGIN" value="100" />
         <option name="WRAP_COMMENTS" value="true" />
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />