d05c6e8834
Conflicts: java/res/xml/method.xml Change-Id: I033d512e23c84d6c803805c9b05eec88969f97df |
||
---|---|---|
.. | ||
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 |