Merge "Remove GregorianCalendar hack"

/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package libcore.util;

import com.android.tools.layoutlib.annotations.LayoutlibDelegate;

import java.util.GregorianCalendar;

/**

 * Delegate used to provide alternate implementation of select methods in {@link ZoneInfo.WallTime}

 */

public class ZoneInfo_WallTime_Delegate {

    @LayoutlibDelegate

    static GregorianCalendar createGregorianCalendar() {

        return new GregorianCalendar();

    }

}

        "libcore.io.MemoryMappedFile#mmapRO",

        "libcore.io.MemoryMappedFile#close",

        "libcore.io.MemoryMappedFile#bigEndianIterator",

        "libcore.util.ZoneInfo$WallTime#createGregorianCalendar",

    };

    /**