e75e4463cd
Conflicts: java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d |
||
---|---|---|
.. | ||
attrs.xml | ||
bools.xml | ||
colors.xml | ||
config.xml | ||
dimens.xml | ||
donottranslate-altchars.xml | ||
donottranslate.xml | ||
durations.xml | ||
keycodes.xml | ||
strings.xml | ||
styles.xml | ||
whitelist.xml |