Merge "Revert "Default package obfuscation should be general renaming, not repackaging.""
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
index 87a36e6..e5356bc 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
@@ -389,7 +389,7 @@
super(factory,
ImmutableList.of() /* injars */,
ImmutableList.of() /* libraryjars */,
- PackageObfuscationMode.NONE,
+ PackageObfuscationMode.REPACKAGE, /* TODO(b/36799686): should be NONE once implemented */
"" /* package prefix */,
false /* allowAccessModification */,
false /* ignoreWarnings */,