commit 4fea2aefc3dd8a672df2c9dd9381f009a57e4b9b
author Chris Craik <ccraik@google.com> Wed Nov 29 00:28:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 29 00:28:29 2017 +0000
tree 19de5579d607c20014c82ad8e4dd1d857c4524c2
parent b09822fec7fa1fa5dcdcca45fcbac010fcc09da1
parent fa585c2ac7085a514349685c79152a0f3a4f51fb

Merge "Fully disable kotlin '*' imports" into oc-mr1-support-27.0-dev

.idea/codeStyleSettings.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 8abdf5a..8c113a2 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -92,7 +92,11 @@
         <option name="WHILE_BRACE_FORCE" value="3" />
         <option name="FOR_BRACE_FORCE" value="3" />
         <JetCodeStyleSettings>
+          <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+            <value />
+          </option>
           <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+          <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
         </JetCodeStyleSettings>
         <Objective-C-extensions>
           <file>
@@ -317,4 +321,4 @@
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="AndroidStyle" />
   </component>
-</project>
\ No newline at end of file
+</project>