youtaol e0084f6652 Merge heads

2013-02-21 14:32:04 +08:00

..

arrays_do_not_translate.xml

Change testTrackStartTime to testTrackRelativeTime.

2013-02-21 14:31:49 +08:00

colors.xml

Change testTrackStartTime to testTrackRelativeTime.

2013-02-21 14:31:49 +08:00

dimens.xml

Change testTrackStartTime to testTrackRelativeTime.

2013-02-21 14:31:49 +08:00

do_not_translate.xml

Merge heads

2013-02-21 14:32:04 +08:00

keys.xml

Change testTrackStartTime to testTrackRelativeTime.

2013-02-21 14:31:49 +08:00

plurals.xml

Change testTrackStartTime to testTrackRelativeTime.

2013-02-21 14:31:49 +08:00

strings.xml

Merge heads

2013-02-21 14:32:04 +08:00

styles.xml

Merge heads

2013-02-21 14:32:04 +08:00