Merge "[SettingsProvider] fix timestamp format in dump" into tm-dev

            return;

        }

        HistoricalOperation operation = new HistoricalOperation(

                SystemClock.elapsedRealtime(), type,

                System.currentTimeMillis(), type,

                setting != null ? new Setting(setting) : null);

        if (mNextHistoricalOpIdx >= mHistoricalOperations.size()) {

            mHistoricalOperations.add(operation);