Conflicts: java/res/values/strings.xml Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90 |
||
---|---|---|
.. | ||
attrs.xml | ||
bools.xml | ||
colors.xml | ||
dimens.xml | ||
donottranslate.xml | ||
durations.xml | ||
keycodes.xml | ||
strings.xml | ||
styles.xml |
Conflicts: java/res/values/strings.xml Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90 |
||
---|---|---|
.. | ||
attrs.xml | ||
bools.xml | ||
colors.xml | ||
dimens.xml | ||
donottranslate.xml | ||
durations.xml | ||
keycodes.xml | ||
strings.xml | ||
styles.xml |