Merge branch android10-qpr1-release
Change-Id: Id2f37e2db80b46ec14e5a5787c3b7be2fca3baec
diff --git a/xsd/halManifest/api/current.txt b/xsd/halManifest/api/current.txt
index 4783bdb..9c0e700 100644
--- a/xsd/halManifest/api/current.txt
+++ b/xsd/halManifest/api/current.txt
@@ -6,13 +6,13 @@
method public String getFormat();
method public java.util.List<java.lang.String> getFqname();
method public String getName();
- method public String getOptional();
+ method public String getOverride();
method public hal.manifest.Hal.Transport getTransport();
method public java.util.List<java.lang.String> getVersion();
method public java.util.List<hal.manifest.Interface> get_interface();
method public void setFormat(String);
method public void setName(String);
- method public void setOptional(String);
+ method public void setOverride(String);
method public void setTransport(hal.manifest.Hal.Transport);
}
diff --git a/xsd/halManifest/hal_manifest.xsd b/xsd/halManifest/hal_manifest.xsd
index 688abeb..6c22797 100644
--- a/xsd/halManifest/hal_manifest.xsd
+++ b/xsd/halManifest/hal_manifest.xsd
@@ -50,7 +50,7 @@
<xs:element name="fqname" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="format" type="xs:string"/>
- <xs:attribute name="optional" type="xs:string"/>
+ <xs:attribute name="override" type="xs:string"/>
</xs:complexType>
<xs:complexType name="interface">
<xs:sequence>