| commit | 6de1e868f6a43e097ad086df53e6e17b6c29a326 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Nov 06 05:17:45 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 06 05:17:46 2014 +0000 |
| tree | 65e48726ecc4141b23bd44a4a7aa2f0a07649439 | |
| parent | fa682949190c7b2426b4868ec27aee4b62ac2466 [diff] | |
| parent | ec34b115efb2bd350d22a4a3d86208a042cee984 [diff] |
Merge changes I1adcd9a5,I0e090770 into lmp-docs * changes: Convert MediaEffects sample to use 'Application' module Remove compile-sdk constraints from DocumentsUI samples
diff --git a/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java b/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java similarity index 100% rename from wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java rename to wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java
diff --git a/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java b/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java index b85d2d1..2e1d46c 100644 --- a/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java +++ b/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java
@@ -33,5 +33,5 @@ public static final String KEY_CONTENT = "content"; public static final String ACTION_DISMISS - = "com.example.android.synchronizednotifications.DISMISS"; + = "com.example.android.wearable.synchronizednotifications.DISMISS"; }