hg: amber/amber/jaxp: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: 801d8ee7ad9d
Author:    langtools
Date:      2017-05-12 01:28 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/801d8ee7ad9d

Automatic merge with constant-folding

- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java