diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:34:11 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:34:11 +0000 |
commit | 0883e63804200f993fb74ea49033ed592450cdcf (patch) | |
tree | c19652f571e82fda8df37b011482d499d6fab485 | |
parent | b999712946d5141812fa2456e652db6b818d439e (diff) | |
parent | e82c025489556c04b84e1b7e5de50bc279bdac84 (diff) | |
download | androidplot-android12-mainline-tethering-release.tar.gz |
Snap for 7550844 from e82c025489556c04b84e1b7e5de50bc279bdac84 to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-release
Change-Id: Icb53f8de06486f40f06dd296f7dee996e9f5a998
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | Examples/DemoApp/res/values/style.xml | 2 | ||||
-rw-r--r-- | METADATA | 1 |
3 files changed, 19 insertions, 1 deletions
@@ -14,6 +14,23 @@ // 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 188f3a0..4c35081 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/lib/com.androidplot.xy">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="sample_activity">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
@@ -10,6 +10,7 @@ third_party { 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 |