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