Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d29a06a authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

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

parents 93b828de 8c766fea

tools/layoutlib/.idea/codeStyleSettings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,12 +27,12 @@ 
            <package name="" withSubpackages="true" static="true" />

            <package name="" withSubpackages="true" static="true" />

          </value>

          </value>

        </option>

        </option>

        <option name="RIGHT_MARGIN" value="100" />

        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />

        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />

        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />

        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />

        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />

        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />

        <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />

        <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />

        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" 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" />

        <option name="WRAP_COMMENTS" value="true" />

        <XML>

        <XML>

          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />

          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />