Merge change 22988 into eclair

            // default to "en"

            buffer.append("en");

        }

        // add the model for the release build

        if ("REL".equals(Build.VERSION.CODENAME)) {

            final String model = Build.MODEL;

            if (model.length() > 0) {

                buffer.append("; ");

                buffer.append(model);

            }

        }

        final String id = Build.ID;

        if (id.length() > 0) {

            buffer.append(" Build/");