diff options
| author | Ying Wang <wangying@google.com> | 2012-08-30 13:58:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-30 13:58:51 -0700 |
| commit | a30f9f3ab4e0e42e02540518dd37b352257cd98d (patch) | |
| tree | b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb | |
| parent | 06b3293d5af3454a39681cfd659271551354b8a0 (diff) | |
| parent | 501c5d48c9b61bd981c809dacb63d06e666adc8c (diff) | |
| download | android_frameworks_opt_calendar-cm-10.1.tar.gz android_frameworks_opt_calendar-cm-10.1.tar.bz2 android_frameworks_opt_calendar-cm-10.1.zip | |
Merge commit '501c5d48' into manualmergecm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
Conflicts:
Android.mk
Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,7 +16,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := calendar-common -LOCAL_SDK_VERSION := current + +LOCAL_SDK_VERSION := 15 LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_STATIC_JAVA_LIBRARY) |