summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-06-30 11:30:31 (GMT)
committerKenny Guy <kennyguy@google.com>2014-06-30 11:30:31 (GMT)
commitc2bd8101b8e26b9ebb2c079ae6867229dad3f196 (patch)
treea959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f /Android.mk
parent40c5ed303909c4df71037be3429aa1423e59585f (diff)
downloadandroid_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.zip
android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.gz
android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.bz2
Revert "Revert Cls stopping now-master running on googlefood"
This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb. Conflicts: src/com/android/launcher3/BubbleTextView.java Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index dbce33f..6e8365f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,7 +36,8 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
-LOCAL_SDK_VERSION := 19
+# STOPSHIP(kennyguy): change to 21 once the L SDK is baked.
+LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := Launcher3
#LOCAL_CERTIFICATE := shared