diff options
| author | Michael Chan <mchan@android.com> | 2013-02-06 12:05:47 -0800 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2013-02-06 12:05:47 -0800 |
| commit | 603bddaf1646e41543c9df9c471cb7f6c8870292 (patch) | |
| tree | 3a7393ebab494c950fb6fb6c45ff89723b45a61a /Android.mk | |
| parent | 2738868c9001c557e32953d716278a2fa0e97b19 (diff) | |
| parent | 2ca9164900f740755429a5e7cc40aa3e24f0e4f7 (diff) | |
| download | android_packages_apps_Calendar-603bddaf1646e41543c9df9c471cb7f6c8870292.tar.gz android_packages_apps_Calendar-603bddaf1646e41543c9df9c471cb7f6c8870292.tar.bz2 android_packages_apps_Calendar-603bddaf1646e41543c9df9c471cb7f6c8870292.zip | |
Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchup
Conflicts:
Android.mk
res/values-de/strings.xml
src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
Change-Id: Ibee089fc6a12ea9dcde5555992fb873afd501224
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -4,7 +4,7 @@ include $(CLEAR_VARS) # Include res dir from chips chips_dir := ../../../frameworks/ex/chips/res res_dirs := $(chips_dir) res -src_dirs := src extensions_src +src_dirs := src LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.* @@ -24,6 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-common-chips \ android-support-v4 \ calendar-common + LOCAL_SDK_VERSION := current LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) |