(cherry picked from commit 436253dd63e07ffa5bbf5be98f5f844b2ca6fca5) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| arrays.xml | ||
| attrs.xml | ||
| colors.xml | ||
| dimens.xml | ||
| ids.xml | ||
| strings.xml | ||
| strings_extra.xml | ||
| styles.xml | ||
| themes.xml | ||
(cherry picked from commit 436253dd63e07ffa5bbf5be98f5f844b2ca6fca5) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| arrays.xml | ||
| attrs.xml | ||
| colors.xml | ||
| dimens.xml | ||
| ids.xml | ||
| strings.xml | ||
| strings_extra.xml | ||
| styles.xml | ||
| themes.xml | ||