From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 15 Sep 2009 14:54:32 +0000 (-0700)
Subject: merge from open-source master
X-Git-Tag: android-x86-2.2~120^2~43
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92f4f58d;p=android-x86%2Fdalvik.git

merge from open-source master
---

92f4f58df944fd10c77e3d39d200c38c1491a941
diff --cc dx/src/com/android/dx/cf/code/BytecodeArray.java
index 60f0cee07,de771a996..83cff5d7c
--- a/dx/src/com/android/dx/cf/code/BytecodeArray.java
+++ b/dx/src/com/android/dx/cf/code/BytecodeArray.java
@@@ -1235,8 -1235,8 +1235,8 @@@ public final class BytecodeArray 
           *
           * @param offset   offset to the instruction
           * @param length   length of the instruction, in bytes
-          * @param cst {@code non-null;} the type of the array
 -         * @param type non-null; the type of the array
 -         * @param initVals non-null; list of bytecode offsets for init values
++         * @param type {@code non-null;} the type of the array
 +         * @param initVals {@code non-null;} list of bytecode offsets for init values
           */
          public void visitNewarray(int offset, int length, CstType type,
                  ArrayList<Constant> initVals);
diff --cc dx/src/com/android/dx/dex/code/LocalList.java
index 93e7c3f61,fb6599792..94ca66316
--- a/dx/src/com/android/dx/dex/code/LocalList.java
+++ b/dx/src/com/android/dx/dex/code/LocalList.java
@@@ -279,10 -277,10 +279,10 @@@ public final class LocalList extends Fi
  
          /**
           * Returns whether or not this instance matches the given spec.
 -         * 
 -         * @param otherSpec non-null; the spec in question
 -         * @return <code>true</code> iff this instance matches
 -         * <code>otherSpec</code>
 +         *
-          * @param spec {@code non-null;} the spec in question
++         * @param otherSpec {@code non-null;} the spec in question
 +         * @return {@code true} iff this instance matches
 +         * {@code spec}
           */
          public boolean matches(RegisterSpec otherSpec) {
              return spec.equalsUsingSimpleType(otherSpec);