commit 7291d7b2c58de6670e1fc6a3af4b4b6c200d1ed0
author George Mount <mount@google.com> Wed Nov 05 18:03:51 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 05 18:03:51 2014 +0000
tree 4959cc09069bf69636bd9e28917079fc28977c6b
parent 96171f08c121a7d15a6a8cbdb28e49c917418c1f
parent dd185b657dba19e913e0e01a8213756fdd8e4cfc

Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.

core/java/android/transition/Transition.java

diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index e99c2cf..2705bcf 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -84,8 +84,8 @@
  *
  * <p>Custom transition classes may be instantiated with a <code>transition</code> tag:</p>
  * <pre>&lt;transition class="my.app.transition.CustomTransition"/></pre>
- * <p>Custom transition classes loaded from XML must have a public nullary (no argument)
- * constructor.</p>
+ * <p>Custom transition classes loaded from XML should have a public constructor taking
+ * a {@link android.content.Context} and {@link android.util.AttributeSet}.</p>
  *
  * <p>Note that attributes for the transition are not required, just as they are
  * optional when declared in code; Transitions created from XML resources will use
@@ -955,7 +955,7 @@
      * Views with different IDs, or no IDs whatsoever, will be ignored.
      *
      * <p>Note that using ids to specify targets implies that ids should be unique
-     * within the view hierarchy underneat the scene root.</p>
+     * within the view hierarchy underneath the scene root.</p>
      *
      * @see View#getId()
      * @param targetId The id of a target view, must be a positive number.