diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-21 21:57:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 21:57:41 +0000 |
| commit | 9d8a78c52d230189d24783a83a0924c77506cc81 (patch) | |
| tree | ab100286a960c0a69446355a46ce4a3ff4044cf6 | |
| parent | 75d9b0bca11153a338464f026a979be54a8b1106 (diff) | |
| parent | 260be3ac529568cd44060427839061fb2237d061 (diff) | |
| download | android_packages_wallpapers_MagicSmoke-9d8a78c52d230189d24783a83a0924c77506cc81.tar.gz android_packages_wallpapers_MagicSmoke-9d8a78c52d230189d24783a83a0924c77506cc81.tar.bz2 android_packages_wallpapers_MagicSmoke-9d8a78c52d230189d24783a83a0924c77506cc81.zip | |
am 260be3ac: Merge "Disable MagicSmoke as it depends on hidden APIs." into lmp-dev
* commit '260be3ac529568cd44060427839061fb2237d061':
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 |