| commit | 52077b7a951153ce77e7354c6096b3bcfbec8c3e | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Tue Sep 30 23:03:40 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 30 23:03:40 2014 +0000 |
| tree | 787b954cbde66ca2e32b8858498a16e75039e359 | |
| parent | 2ed99e861b4be73620fd6fdc24a13230e096921c [diff] | |
| parent | 1a85c5839c91942b3c7dd0da5992db4d98defdc3 [diff] |
Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop
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