summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-05-14 14:03:22 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-14 14:03:22 -0700
commitfa0b0f36aeabc5f204c2b063c1e88e09a4b80f05 (patch)
tree57934ee88b28a1cfe993d049b35d424b7247fd19
parent956525423e51315015d6902e3b9487e72e9f4885 (diff)
parentce4abe56b9fa322ede8f8ac66fe6338c946ae007 (diff)
downloadandroid_packages_apps_Calendar-fa0b0f36aeabc5f204c2b063c1e88e09a4b80f05.tar.gz
android_packages_apps_Calendar-fa0b0f36aeabc5f204c2b063c1e88e09a4b80f05.tar.bz2
android_packages_apps_Calendar-fa0b0f36aeabc5f204c2b063c1e88e09a4b80f05.zip
Merge "Fix errors caught by aapt2"
am: ce4abe56b9 Change-Id: I1acf4f7e8384cc6005ffd1997d39cdccee5c8dc0
l---------assets/backward1
l---------assets/zone.tab1
2 files changed, 0 insertions, 2 deletions
diff --git a/assets/backward b/assets/backward
deleted file mode 120000
index 70086b06..00000000
--- a/assets/backward
+++ /dev/null
@@ -1 +0,0 @@
-../../../../external/timezonepicker-support/backward \ No newline at end of file
diff --git a/assets/zone.tab b/assets/zone.tab
deleted file mode 120000
index 46c2d663..00000000
--- a/assets/zone.tab
+++ /dev/null
@@ -1 +0,0 @@
-../../../../external/timezonepicker-support/zone.tab \ No newline at end of file