summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-08-21 22:18:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 22:18:08 +0000
commitddb12686710c8efa8726d94bd8b417eb2e59a9f5 (patch)
tree69a45961f1d0bec484fc136132130ba9d594db18
parentab25164792e4d2ae017b0c7745ff4422300af555 (diff)
parente22d6a23e9b0f1374ad42118e5f5b2360d891c0f (diff)
downloadandroid_packages_wallpapers_MagicSmoke-ddb12686710c8efa8726d94bd8b417eb2e59a9f5.tar.gz
android_packages_wallpapers_MagicSmoke-ddb12686710c8efa8726d94bd8b417eb2e59a9f5.tar.bz2
android_packages_wallpapers_MagicSmoke-ddb12686710c8efa8726d94bd8b417eb2e59a9f5.zip
am e22d6a23: am 9d8a78c5: am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden APIs." into lmp-dev
* commit 'e22d6a23e9b0f1374ad42118e5f5b2360d891c0f': Disable MagicSmoke as it depends on hidden APIs.
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 1f53cb9..af9e2da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,8 @@
# limitations under the License.
#
+ifeq (0,1)
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -27,3 +29,4 @@ LOCAL_CERTIFICATE := shared
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
+endif