diff options
| author | Alan Lau <alanlau@google.com> | 2014-05-21 18:41:44 -0700 |
|---|---|---|
| committer | Alan Lau <alanlau@google.com> | 2014-05-21 18:43:37 -0700 |
| commit | c1eb514b97c158ad696d651da6b036cba4d7e8a3 (patch) | |
| tree | 52f5cabcf50e10dc5f50f2d8c0e02265681302b8 /Android.mk | |
| parent | ff02edb38cfe569b4c062c883b911ac300b56d31 (diff) | |
| parent | 96d7688b5e1e8b6441be3f2c57b13d8b9edfada9 (diff) | |
| download | android_packages_apps_UnifiedEmail-c1eb514b97c158ad696d651da6b036cba4d7e8a3.tar.gz android_packages_apps_UnifiedEmail-c1eb514b97c158ad696d651da6b036cba4d7e8a3.tar.bz2 android_packages_apps_UnifiedEmail-c1eb514b97c158ad696d651da6b036cba4d7e8a3.zip | |
resolved conflicts for merge of 96d7688b to ub-mail-master
Change-Id: Ie79fecb7f8180c9b9e8917a9b8f6ee2f6ceecc86
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 913a9b0e6..bdf747eba 100644 --- a/Android.mk +++ b/Android.mk @@ -39,8 +39,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker LOCAL_STATIC_JAVA_LIBRARIES += owasp-html-sanitizer -# STOPSHIP: Open source the wearable support jar -LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support +LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support-1170785 LOCAL_SDK_VERSION := current |