# Conflicts: # live/src/main/res/layout/dialog_live_data.xml # live/src/main/res/values-zh/strings.xml