DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: Ic4020590e0d8dd2409a2591cb8ff3684daa4e81d
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..24cb8c3
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+android_library {
+    name: "android-opt-timezonepicker",
+    sdk_version: "17",
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.logtags",
+    ],
+
+    resource_dirs: ["res"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a35f0ec..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android-opt-timezonepicker
-
-LOCAL_SDK_VERSION := 17
-
-LOCAL_SRC_FILES := \
-     $(call all-java-files-under, src) \
-     $(call all-logtags-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/assets/backward b/assets/backward
deleted file mode 120000
index 70086b0..0000000
--- 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 46c2d66..0000000
--- a/assets/zone.tab
+++ /dev/null
@@ -1 +0,0 @@
-../../../../external/timezonepicker-support/zone.tab
\ No newline at end of file
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
deleted file mode 100644
index 3df8773..0000000
--- a/res/values-as/arrays.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="timezone_rename_labels">
-    <item msgid="4609638052107641231">"অষ্ট্ৰেলিয়াৰ কেন্দ্ৰীয় সময় - NT"</item>
-    <item msgid="4345275500159159867">"অষ্ট্ৰেলিয়াৰ কেন্দ্ৰীয় সময় - SA"</item>
-    <item msgid="6771274300523132094">"অষ্ট্ৰেলিয়াৰ প্ৰাচ্য সময় - QLD"</item>
-    <item msgid="4685547681424666687">"অষ্ট্ৰেলিয়াৰ প্ৰাচ্য সময় - NSW"</item>
-    <item msgid="5259393186526893961">"পৰ্ব্বতীয় মান সময় - ডাউচ\'ন ক্ৰেক"</item>
-    <item msgid="5984634754870859705">"কেন্দ্ৰীয় মান সময় - ছাছকাটছেৱান"</item>
-    <item msgid="5340374311583423836">"প্ৰাচ্য মান সময় - আটিক\'কান"</item>
-    <item msgid="8922086438245451625">"আটলাণ্টিক মান সময় - কিউবেক"</item>
-    <item msgid="8353677384517034413">"হাৱাই-এলুৱেটিয়ান - হাৱাই"</item>
-    <item msgid="6426791761018806420">"হাৱাই-এলুৱেটিয়ান - আলাস্কা"</item>
-    <item msgid="7076353182411415610">"প্ৰশান্ত মান সময় - মেটলাকাটলা"</item>
-    <item msgid="373990592918179890">"পৰ্ব্বতীয় মান সময় - আৰিজোৱানা"</item>
-    <item msgid="353899326999279114">"প্ৰশান্ত মহাসাগৰীয় সময় - বাজা কেলিফ\'ৰ্নিয়া"</item>
-    <item msgid="6432134534714673873">"পৰ্ব্বতীয় মান সময় - চিহুৱাহুৱা"</item>
-    <item msgid="7629345735485663968">"কেন্দ্ৰীয় সময় - টামাওলিপাচ"</item>
-    <item msgid="3874729044260979505">"পৰ্ব্বতীয় মান সময় - চ\'ন\'ৰা"</item>
-    <item msgid="1106209575683600471">"পূব আফ্ৰিকাৰ সময়"</item>
-    <item msgid="6538017087072480128">"আটলাণ্টিক মান সময়"</item>
-    <item msgid="6758957851822881177">"আটলাণ্টিক মান সময়"</item>
-    <item msgid="2477556470536619081">"প্ৰাচ্য ইউৰোপীয় সময়"</item>
-    <item msgid="7328461310893621937">"কালিনিনগ্ৰাডৰ সময়"</item>
-    <item msgid="4212642599758736931">"আমাজনৰ সময় - ৰ\'ণ্ড\'নিয়া"</item>
-    <item msgid="2370319280810537375">"ব্ৰাজিলিয়াৰ সময় - পেৰে"</item>
-  </string-array>
-  <string-array name="backup_country_names">
-    <item msgid="9141777876082196578">"ছেইণ্ট মাৰ্টিন"</item>
-    <item msgid="5330962017221568054">"কেৰিবিয়ান নেডাৰলেণ্ড"</item>
-    <item msgid="1465164631761814300">"কাৰাকাও"</item>
-    <item msgid="8972081011408691260">"দক্ষিণ ছুডান"</item>
-  </string-array>
-</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 94c1751..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hint_time_zone_search" msgid="804776560897143016">"দেশৰ নাম লিখক"</string>
-    <string name="searchview_description_clear" msgid="1603860069305867810">"প্ৰশ্ন মচক"</string>
-    <string name="no_results_found" msgid="5475293015394772651">"কোনো ফলাফল পোৱা নগ’ল"</string>
-    <string name="palestine_display_name" msgid="3485026339977302148">"পেলেষ্টাইন"</string>
-</resources>