44456dcbf2
Conflicts: java/res/values-af/strings.xml java/res/values-cs/strings.xml java/res/values-et/strings.xml java/res/values-fi/strings.xml java/res/values-hi/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-in/strings.xml java/res/values-ja/strings.xml java/res/values-ko/strings.xml java/res/values-lt/strings.xml java/res/values-lv/strings.xml java/res/values-ms/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sk/strings.xml java/res/values-sl/strings.xml java/res/values-sr/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-vi/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml Change-Id: Ib4141aca0b35148d62d22d4f32309f890c84303a |
||
---|---|---|
.. | ||
attrs.xml | ||
bools.xml | ||
config.xml | ||
dimens.xml | ||
donottranslate.xml | ||
gesture-input.xml | ||
keyboard-heights.xml | ||
keyboard-icons-black.xml | ||
keyboard-icons-ics.xml | ||
keyboard-icons-white.xml | ||
keypress-vibration-durations.xml | ||
keypress-volumes.xml | ||
phantom_sudden_move_event_device_list.xml | ||
predefined-subtypes.xml | ||
strings-appname.xml | ||
strings.xml | ||
styles.xml | ||
sudden-jumping-touch-event-device-list.xml | ||
themes-basic-highcontrast.xml | ||
themes-basic.xml | ||
themes-gingerbread.xml | ||
themes-ics.xml | ||
themes-stone-bold.xml | ||
themes-stone.xml | ||
touch-position-correction.xml | ||
urls.xml | ||
whitelist.xml |