summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-05-14 14:19:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-14 14:19:48 -0700
commit562608d03471fd763893618c2cf1311b5bfdac60 (patch)
tree55356d9b94a4243656d0f41b38f7045f381cb9f2
parent99b87507e1d6f4589ae70074d3edc3a86f6c404f (diff)
parent7b051c6e9ef7922f08d9ebf664ac3087d5fa0552 (diff)
downloadandroid_packages_apps_Calendar-562608d03471fd763893618c2cf1311b5bfdac60.tar.gz
android_packages_apps_Calendar-562608d03471fd763893618c2cf1311b5bfdac60.tar.bz2
android_packages_apps_Calendar-562608d03471fd763893618c2cf1311b5bfdac60.zip
Merge "Fix errors caught by aapt2" am: ce4abe56b9 am: fa0b0f36ae
am: 7b051c6e9e Change-Id: Ie69241f0ae670c3bf7ae389bc2c52c928d0f55d4
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