| commit | c206cb304e2e334211838389c81d7766a0784068 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Nov 06 20:35:21 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 06 20:35:22 2014 +0000 |
| tree | 078b0d2608c68f8c7c896641bbf0cbf4b1788b88 | |
| parent | 44cd4ce7cecbbac01b571dbe75237a43da3563a5 [diff] | |
| parent | 000ff980ed6a95c5967b0c8bb7cad5eeb79a3dad [diff] |
Merge "Add common activites/logger to JumpingJack/Flashlight" into lmp-docs
diff --git a/wearable/wear/Flashlight/template-params.xml b/wearable/wear/Flashlight/template-params.xml index 48e93ae..b6c03ff 100644 --- a/wearable/wear/Flashlight/template-params.xml +++ b/wearable/wear/Flashlight/template-params.xml
@@ -39,5 +39,6 @@ <template src="base"/> <template src="Wear"/> - + <common src="logger"/> + <common src="activities"/> </sample>
diff --git a/wearable/wear/JumpingJack/template-params.xml b/wearable/wear/JumpingJack/template-params.xml index 8704b82..a067ae5 100644 --- a/wearable/wear/JumpingJack/template-params.xml +++ b/wearable/wear/JumpingJack/template-params.xml
@@ -38,5 +38,7 @@ <template src="base"/> <template src="Wear"/> + <common src="logger"/> + <common src="activities"/> </sample>