Fix merge conflict from backout of bug 872806

mobile/android/base/Distribution.java

@@ -81,11 +81,8 @@ public final class Distribution {
                     File distDir = new File("/system/" + context.getPackageName() + "/distribution");
                     if (distDir.exists()) {
                         distributionSet = true;
-<<<<<<< local
                         distPath = distDir.getPath();
                         settings.edit().putString(pathKeyName, distPath).commit();
-=======
->>>>>>> other
                     }
                 }