Merge "fix ActivityMetricsLogger counter names"

    // Preallocated strings we are sending to tron, so we don't have to allocate a new one every

    // Preallocated strings we are sending to tron, so we don't have to allocate a new one every

    // time we log.

    // time we log.

    private static final String[] TRON_WINDOW_STATE_VARZ_STRINGS = {

    private static final String[] TRON_WINDOW_STATE_VARZ_STRINGS = {

            "tron_varz_window_time_0", "tron_varz_window_time_1", "tron_varz_window_time_2"};

            "window_time_0", "window_time_1", "window_time_2"};

    private int mWindowState = WINDOW_STATE_STANDARD;

    private int mWindowState = WINDOW_STATE_STANDARD;

    private long mLastLogTimeSecs;

    private long mLastLogTimeSecs;