diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-21 22:07:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 22:07:15 +0000 |
| commit | e22d6a23e9b0f1374ad42118e5f5b2360d891c0f (patch) | |
| tree | ab100286a960c0a69446355a46ce4a3ff4044cf6 | |
| parent | b7eb4cb9c51115e2b23c06c6a7418f43114a56de (diff) | |
| parent | 9d8a78c52d230189d24783a83a0924c77506cc81 (diff) | |
| download | android_packages_wallpapers_MagicSmoke-e22d6a23e9b0f1374ad42118e5f5b2360d891c0f.tar.gz android_packages_wallpapers_MagicSmoke-e22d6a23e9b0f1374ad42118e5f5b2360d891c0f.tar.bz2 android_packages_wallpapers_MagicSmoke-e22d6a23e9b0f1374ad42118e5f5b2360d891c0f.zip | |
am 9d8a78c5: am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden APIs." into lmp-dev
* commit '9d8a78c52d230189d24783a83a0924c77506cc81':
Disable MagicSmoke as it depends on hidden APIs.
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |