Snap for 8426163 from b999712946d5141812fa2456e652db6b818d439e to mainline-tzdata2-release
Change-Id: Id6881b2c34e4c2b87e5b1e10c258c6f70bad2d64
diff --git a/Android.bp b/Android.bp
index 8162a50..4f48ead 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,23 +14,6 @@
// Core androidplot library
-package {
- default_applicable_licenses: ["external_androidplot_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "external_androidplot_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "NOTICE",
- ],
-}
-
java_library {
name: "androidplot",
sdk_version: "current",
diff --git a/Examples/DemoApp/res/values/style.xml b/Examples/DemoApp/res/values/style.xml
index 4c35081..188f3a0 100644
--- a/Examples/DemoApp/res/values/style.xml
+++ b/Examples/DemoApp/res/values/style.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/lib/com.androidplot.xy">
<style name="sample_activity">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
diff --git a/METADATA b/METADATA
index 0ff0c57..64175e8 100644
--- a/METADATA
+++ b/METADATA
@@ -10,7 +10,6 @@
value: "https://github.com/halfhp/androidplot/archive/0.6.0.zip"
}
version: "0.6.0"
- license_type: NOTICE
last_upgrade_date {
year: 2014
month: 2
