diff options
| author | Alan Lau <alanlau@google.com> | 2014-05-28 09:27:40 -0700 |
|---|---|---|
| committer | Alan Lau <alanlau@google.com> | 2014-05-28 09:27:40 -0700 |
| commit | a7b23dab1adfaf166c5eb8136b3d137c3db77f06 (patch) | |
| tree | 6c037977619a7cb9fee692653a2f95eba5237524 /Android.mk | |
| parent | f226315cb962cbf8d7de9b7d72483dbe9217134a (diff) | |
| parent | 439aa5d7d9226de4682c3697c68c0703b8847518 (diff) | |
| download | android_packages_apps_UnifiedEmail-a7b23dab1adfaf166c5eb8136b3d137c3db77f06.tar.gz android_packages_apps_UnifiedEmail-a7b23dab1adfaf166c5eb8136b3d137c3db77f06.tar.bz2 android_packages_apps_UnifiedEmail-a7b23dab1adfaf166c5eb8136b3d137c3db77f06.zip | |
resolved conflicts for merge of 439aa5d7 to ub-mail-master
Change-Id: I8bca2214d72249b9c289763ba5b304b208521fb1
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index bdf747eba..75a374751 100644 --- a/Android.mk +++ b/Android.mk @@ -39,7 +39,6 @@ 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 -LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support-1170785 LOCAL_SDK_VERSION := current |