commit 286f37509266e0872f709857178736c737746472
author Trevor Johns <trevorjohns@google.com> Wed Oct 30 21:58:31 2013 -0700
committer Trevor Johns <trevorjohns@google.com> Wed Oct 30 21:58:31 2013 -0700
tree 3446b0acfab651e69a37cf45631a2643e61292da
parent 7f46045f6bd2c60e85e6ecfe358448ca6afb2dc9

Revert "Templates: Make sure resources are unique"

This reverts commit 2fe60eb2d6eee22757a2354ef392bfde56c64ee6.

templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml

diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/activitycards-dimens.xml b/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml
similarity index 100%
rename from templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/activitycards-dimens.xml
rename to templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml

templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml

diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-styles.xml b/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml
similarity index 100%
rename from templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-styles.xml
rename to templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml

templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml

diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-dimens.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
similarity index 100%
rename from templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-dimens.xml
rename to templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml

templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml

diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
similarity index 100%
rename from templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-styles.xml
rename to templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml

templates/SimpleView/_MODULE_/src/template/res/values/styles.xml

diff --git a/templates/SimpleView/_MODULE_/src/template/res/values/simpleview-styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values/styles.xml
similarity index 100%
rename from templates/SimpleView/_MODULE_/src/template/res/values/simpleview-styles.xml
rename to templates/SimpleView/_MODULE_/src/template/res/values/styles.xml

templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml

diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-dimens.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
similarity index 100%
rename from templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-dimens.xml
rename to templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml

templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml

diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-styles.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
similarity index 100%
rename from templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-styles.xml
rename to templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml

templates/SingleView/_MODULE_/src/template/res/values/styles.xml

diff --git a/templates/SingleView/_MODULE_/src/template/res/values/singleview-styles.xml b/templates/SingleView/_MODULE_/src/template/res/values/styles.xml
similarity index 100%
rename from templates/SingleView/_MODULE_/src/template/res/values/singleview-styles.xml
rename to templates/SingleView/_MODULE_/src/template/res/values/styles.xml

templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml

diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/base-dimens.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml
similarity index 100%
rename from templates/base/_MODULE_/src/template/res/values-sw600dp/base-dimens.xml
rename to templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml

templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml

diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/base-styles.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml
similarity index 100%
rename from templates/base/_MODULE_/src/template/res/values-sw600dp/base-styles.xml
rename to templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml

templates/base/_MODULE_/src/template/res/values/dimens.xml

diff --git a/templates/base/_MODULE_/src/template/res/values/base-dimens.xml b/templates/base/_MODULE_/src/template/res/values/dimens.xml
similarity index 100%
rename from templates/base/_MODULE_/src/template/res/values/base-dimens.xml
rename to templates/base/_MODULE_/src/template/res/values/dimens.xml

templates/base/_MODULE_/src/template/res/values/styles.xml

diff --git a/templates/base/_MODULE_/src/template/res/values/base-styles.xml b/templates/base/_MODULE_/src/template/res/values/styles.xml
similarity index 100%
rename from templates/base/_MODULE_/src/template/res/values/base-styles.xml
rename to templates/base/_MODULE_/src/template/res/values/styles.xml