diff options
author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
commit | 1f5a43d0469fce561c311a19c85ac8dd036c4cac (patch) | |
tree | 3b3ce44c9eccb23e898ee53c45c3e9bac1962fb7 /Android.mk | |
parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
download | android_packages_apps_DeskClock-mr1.1-staging.tar.gz android_packages_apps_DeskClock-mr1.1-staging.tar.bz2 android_packages_apps_DeskClock-mr1.1-staging.zip |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1mr1.1-staging
Android 4.2.2 release 1
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmKlaxon.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SettingsActivity.java
Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index f19bc8142..a0d1b191a 100644 --- a/Android.mk +++ b/Android.mk @@ -12,7 +12,7 @@ LOCAL_PACKAGE_NAME := DeskClock LOCAL_OVERRIDES_PACKAGES := AlarmClock -LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := 17 LOCAL_PROGUARD_FLAG_FILES := proguard.flags |