aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/xml
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-05-09 19:22:27 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-05-10 07:57:21 +0000
commit5a2dd7a2099cfa5a50b07d2b407e478043727472 (patch)
tree3e4cd3341cb359151ed32132c9443a62cd80e49e /src/tools/android/java/com/google/devtools/build/android/xml
parentb64150de45415f3871e1de0a2c182636567b9225 (diff)
Renaming nonOverwriting to combining resources.
-- MOS_MIGRATED_REVID=121863653
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/xml')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
index 47da07fc26..62fcf4b629 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
@@ -140,8 +140,8 @@ public class StyleableXmlResourceValue implements XmlResourceValue {
* {@link FullyQualifiedName} results in a single Styleable containing a union of all the
* attribute references.
*
- * @param value Another {@link StyleableXmlResourceValue} with the same {@link FullyQualifiedName}
- * .
+ * @param value Another {@link StyleableXmlResourceValue} with the same
+ * {@link FullyQualifiedName}.
* @return {@link StyleableXmlResourceValue} containing a sorted union of the attribute
* references.
* @throws IllegalArgumentException if value is not an {@link StyleableXmlResourceValue}.