commit c3787cc4d8f208c966574521275c5b33bf1c96bc
author Bjorn Bringert <bringert@google.com> Sat Oct 18 16:37:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 18 16:37:31 2014 +0000
tree 8b412fe16874d42656732d63e863aaa28aaf7c71
parent 67eeffb0b8b849d9e8308a19f8690346e0f2b182
parent f6b97f7391aa0c3c4f67b3c9ed4d5c6a29759c74

am f6b97f73: am d54cf543: am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21

* commit 'f6b97f7391aa0c3c4f67b3c9ed4d5c6a29759c74':
  Build Launcher3 against prebuilt SDK 21

Android.mk

diff --git a/Android.mk b/Android.mk
index 6e8365f..110117b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,8 +36,7 @@
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
 
-# STOPSHIP(kennyguy): change to 21 once the L SDK is baked.
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 21
 
 LOCAL_PACKAGE_NAME := Launcher3
 #LOCAL_CERTIFICATE := shared