tree 19de5579d607c20014c82ad8e4dd1d857c4524c2
parent b09822fec7fa1fa5dcdcca45fcbac010fcc09da1
parent fa585c2ac7085a514349685c79152a0f3a4f51fb
author Chris Craik <ccraik@google.com> 1511915309 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1511915309 +0000

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